39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
--- ../src_base/minecraft_server/net/minecraft/src/ModLoaderMp.java 0000-00-00 00:00:00.000000000 -0000
|
|
+++ ../src_work/minecraft_server/net/minecraft/src/ModLoaderMp.java 0000-00-00 00:00:00.000000000 -0000
|
|
@@ -16,6 +16,7 @@
|
|
import java.util.Map.Entry;
|
|
import java.util.logging.Logger;
|
|
import net.minecraft.server.MinecraftServer;
|
|
+import net.minecraft.src.forge.DimensionManager;
|
|
|
|
public class ModLoaderMp
|
|
{
|
|
@@ -231,13 +232,11 @@
|
|
|
|
public static World getPlayerWorld(EntityPlayer var0)
|
|
{
|
|
- WorldServer[] var1 = ModLoader.getMinecraftServerInstance().worldMngr;
|
|
-
|
|
- for (int var2 = 0; var2 < var1.length; ++var2)
|
|
+ for (World world : DimensionManager.getWorlds())
|
|
{
|
|
- if (var1[var2].playerEntities.contains(var0))
|
|
+ if (world.playerEntities.contains(var0))
|
|
{
|
|
- return var1[var2];
|
|
+ return world;
|
|
}
|
|
}
|
|
|
|
@@ -384,6 +383,11 @@
|
|
|
|
for (var5 = 0; var5 < ModLoader.getLoadedMods().size(); ++var5)
|
|
{
|
|
+ if (!(ModLoader.getLoadedMods().get(var5) instanceof BaseModMp))
|
|
+ {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
BaseModMp var6 = (BaseModMp)ModLoader.getLoadedMods().get(var5);
|
|
|
|
if (var6.hasClientSide() && var6.toString().lastIndexOf("mod_") != -1)
|