91 lines
5.9 KiB
Diff
91 lines
5.9 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
|
|
@@ -268,7 +268,7 @@
|
|
{
|
|
PacketThreadUtil.func_180031_a(p_147282_1_, this, this.field_147299_f);
|
|
this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this);
|
|
- this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), p_147282_1_.func_149194_f(), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
|
|
+ this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), net.minecraftforge.fml.common.network.handshake.NetworkDispatcher.get(func_147298_b()).getOverrideDimension(p_147282_1_), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
|
|
this.field_147299_f.field_71474_y.field_74318_M = p_147282_1_.func_149192_g();
|
|
this.field_147299_f.func_71403_a(this.field_147300_g);
|
|
this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f();
|
|
@@ -797,14 +797,16 @@
|
|
public void func_147251_a(SPacketChat p_147251_1_)
|
|
{
|
|
PacketThreadUtil.func_180031_a(p_147251_1_, this, this.field_147299_f);
|
|
+ net.minecraft.util.text.ITextComponent message = net.minecraftforge.event.ForgeEventFactory.onClientChat(p_147251_1_.func_179841_c(), p_147251_1_.func_148915_c());
|
|
+ if (message == null) return;
|
|
|
|
if (p_147251_1_.func_179841_c() == 2)
|
|
{
|
|
- this.field_147299_f.field_71456_v.func_175188_a(p_147251_1_.func_148915_c(), false);
|
|
+ this.field_147299_f.field_71456_v.func_175188_a(message, false);
|
|
}
|
|
else
|
|
{
|
|
- this.field_147299_f.field_71456_v.func_146158_b().func_146227_a(p_147251_1_.func_148915_c());
|
|
+ this.field_147299_f.field_71456_v.func_146158_b().func_146227_a(message);
|
|
}
|
|
}
|
|
|
|
@@ -860,6 +862,11 @@
|
|
float f = (float)(p_147281_1_.func_149028_l() * 360) / 256.0F;
|
|
float f1 = (float)(p_147281_1_.func_149030_m() * 360) / 256.0F;
|
|
EntityLivingBase entitylivingbase = (EntityLivingBase)EntityList.func_75616_a(p_147281_1_.func_149025_e(), this.field_147299_f.field_71441_e);
|
|
+ if (entitylivingbase == null)
|
|
+ {
|
|
+ net.minecraftforge.fml.common.FMLLog.info("Server attempted to spawn an unknown entity using ID: {0} at ({1}, {2}, {3}) Skipping!", p_147281_1_.func_149025_e(), d0, d1, d2);
|
|
+ return;
|
|
+ }
|
|
EntityTracker.func_187254_a(entitylivingbase, d0, d1, d2);
|
|
entitylivingbase.field_70761_aq = entitylivingbase.field_70759_as = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F;
|
|
Entity[] aentity = entitylivingbase.func_70021_al();
|
|
@@ -931,7 +938,7 @@
|
|
|
|
if (entity1 == this.field_147299_f.field_71439_g && !flag)
|
|
{
|
|
- this.field_147299_f.field_71456_v.func_110326_a(I18n.func_135052_a("mount.onboard", new Object[] {GameSettings.func_74298_c(this.field_147299_f.field_71474_y.field_74311_E.func_151463_i())}), false);
|
|
+ this.field_147299_f.field_71456_v.func_110326_a(I18n.func_135052_a("mount.onboard", new Object[] {this.field_147299_f.field_71474_y.field_74311_E.getDisplayName()}), false);
|
|
}
|
|
}
|
|
}
|
|
@@ -1162,6 +1169,10 @@
|
|
{
|
|
tileentity.func_145839_a(p_147273_1_.func_148857_g());
|
|
}
|
|
+ else
|
|
+ {
|
|
+ tileentity.onDataPacket(field_147302_e, p_147273_1_);
|
|
+ }
|
|
|
|
if (flag && this.field_147299_f.field_71462_r instanceof GuiCommandBlock)
|
|
{
|
|
@@ -1259,15 +1270,15 @@
|
|
}
|
|
else if (f == 101.0F)
|
|
{
|
|
- this.field_147299_f.field_71456_v.func_146158_b().func_146227_a(new TextComponentTranslation("demo.help.movement", new Object[] {GameSettings.func_74298_c(gamesettings.field_74351_w.func_151463_i()), GameSettings.func_74298_c(gamesettings.field_74370_x.func_151463_i()), GameSettings.func_74298_c(gamesettings.field_74368_y.func_151463_i()), GameSettings.func_74298_c(gamesettings.field_74366_z.func_151463_i())}));
|
|
+ this.field_147299_f.field_71456_v.func_146158_b().func_146227_a(new TextComponentTranslation("demo.help.movement", new Object[] {gamesettings.field_74351_w.getDisplayName(), gamesettings.field_74370_x.getDisplayName(), gamesettings.field_74368_y.getDisplayName(), gamesettings.field_74366_z.getDisplayName()}));
|
|
}
|
|
else if (f == 102.0F)
|
|
{
|
|
- this.field_147299_f.field_71456_v.func_146158_b().func_146227_a(new TextComponentTranslation("demo.help.jump", new Object[] {GameSettings.func_74298_c(gamesettings.field_74314_A.func_151463_i())}));
|
|
+ this.field_147299_f.field_71456_v.func_146158_b().func_146227_a(new TextComponentTranslation("demo.help.jump", new Object[] {gamesettings.field_74314_A.getDisplayName()}));
|
|
}
|
|
else if (f == 103.0F)
|
|
{
|
|
- this.field_147299_f.field_71456_v.func_146158_b().func_146227_a(new TextComponentTranslation("demo.help.inventory", new Object[] {GameSettings.func_74298_c(gamesettings.field_151445_Q.func_151463_i())}));
|
|
+ this.field_147299_f.field_71456_v.func_146158_b().func_146227_a(new TextComponentTranslation("demo.help.inventory", new Object[] {gamesettings.field_151445_Q.getDisplayName()}));
|
|
}
|
|
}
|
|
else if (i == 6)
|
|
@@ -1361,7 +1372,7 @@
|
|
|
|
if (entity instanceof EntityLivingBase)
|
|
{
|
|
- Potion potion = Potion.func_188412_a(p_147260_1_.func_149427_e());
|
|
+ Potion potion = Potion.func_188412_a(p_147260_1_.func_149427_e() & 0xFF);
|
|
|
|
if (potion != null)
|
|
{
|