mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 12:20:11 +00:00
62 lines
3.3 KiB
Diff
62 lines
3.3 KiB
Diff
--- ../src-base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
|
|
+++ ../src-work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
|
|
@@ -3,6 +3,8 @@
|
|
import com.google.common.base.Charsets;
|
|
import com.google.common.collect.Maps;
|
|
import com.mojang.authlib.GameProfile;
|
|
+
|
|
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
import cpw.mods.fml.relauncher.Side;
|
|
import cpw.mods.fml.relauncher.SideOnly;
|
|
import java.io.File;
|
|
@@ -88,7 +90,7 @@
|
|
this.field_72405_c = 8;
|
|
}
|
|
|
|
- public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_)
|
|
+ public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_, NetHandlerPlayServer nethandlerplayserver)
|
|
{
|
|
NBTTagCompound nbttagcompound = this.func_72380_a(p_72355_2_);
|
|
p_72355_2_.func_70029_a(this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK));
|
|
@@ -104,7 +106,7 @@
|
|
WorldServer worldserver = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
|
|
ChunkCoordinates chunkcoordinates = worldserver.func_72861_E();
|
|
this.func_72381_a(p_72355_2_, (EntityPlayerMP)null, worldserver);
|
|
- NetHandlerPlayServer nethandlerplayserver = new NetHandlerPlayServer(this.field_72400_f, p_72355_1_, p_72355_2_);
|
|
+ p_72355_2_.field_71135_a = nethandlerplayserver;
|
|
nethandlerplayserver.func_147359_a(new S01PacketJoinGame(p_72355_2_.func_145782_y(), p_72355_2_.field_71134_c.func_73081_b(), worldserver.func_72912_H().func_76093_s(), worldserver.field_73011_w.field_76574_g, worldserver.field_73013_u, this.func_72352_l(), worldserver.func_72912_H().func_76067_t()));
|
|
nethandlerplayserver.func_147359_a(new S3FPacketCustomPayload("MC|Brand", this.func_72365_p().getServerModName().getBytes(Charsets.UTF_8)));
|
|
nethandlerplayserver.func_147359_a(new S05PacketSpawnPosition(chunkcoordinates.field_71574_a, chunkcoordinates.field_71572_b, chunkcoordinates.field_71573_c));
|
|
@@ -136,6 +138,7 @@
|
|
|
|
p_72355_2_.func_71116_b();
|
|
|
|
+ FMLCommonHandler.instance().firePlayerLoggedIn(p_72355_2_);
|
|
if (nbttagcompound != null && nbttagcompound.func_150297_b("Riding", 10))
|
|
{
|
|
Entity entity = EntityList.func_75615_a(nbttagcompound.func_74775_l("Riding"), worldserver);
|
|
@@ -256,6 +259,7 @@
|
|
|
|
public void func_72367_e(EntityPlayerMP p_72367_1_)
|
|
{
|
|
+ FMLCommonHandler.instance().firePlayerLoggedOut(p_72367_1_);
|
|
p_72367_1_.func_71029_a(StatList.field_75947_j);
|
|
this.func_72391_b(p_72367_1_);
|
|
WorldServer worldserver = p_72367_1_.func_71121_q();
|
|
@@ -415,6 +419,7 @@
|
|
this.field_72404_b.add(entityplayermp1);
|
|
entityplayermp1.func_71116_b();
|
|
entityplayermp1.func_70606_j(entityplayermp1.func_110143_aJ());
|
|
+ FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1);
|
|
return entityplayermp1;
|
|
}
|
|
|
|
@@ -440,6 +445,7 @@
|
|
PotionEffect potioneffect = (PotionEffect)iterator.next();
|
|
p_72356_1_.field_71135_a.func_147359_a(new S1DPacketEntityEffect(p_72356_1_.func_145782_y(), potioneffect));
|
|
}
|
|
+ FMLCommonHandler.instance().firePlayerChangedDimensionEvent(p_72356_1_, j, p_72356_2_);
|
|
}
|
|
|
|
public void func_82448_a(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_)
|