keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Move the patch into the fml override handler, for less patch

This commit is contained in:
cpw 2016-03-09 20:08:24 -05:00
parent 301d4b9fa0
commit 98f606d4d2
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
patches.mcp/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch
View File

@ -1,14 +1,6 @@
--- ../src-base/minecraft/net/minecraft/network/NetHandlerPlayServer.java --- ../src-base/minecraft/net/minecraft/network/NetHandlerPlayServer.java
+++ ../src-work/minecraft/net/minecraft/network/NetHandlerPlayServer.java +++ ../src-work/minecraft/net/minecraft/network/NetHandlerPlayServer.java
@@ -159,6 +159,7 @@ @@ -612,7 +612,10 @@
public void update()
{
+ if (this.playerEntity.playerNetServerHandler != this) return; // FORGE: sometimes the netqueue will tick while login is occuring, causing an NPE. We shouldn't tick until the connection is complete
this.func_184342_d();
this.playerEntity.onUpdateEntity();
this.playerEntity.setPositionAndRotation(this.field_184349_l, this.field_184350_m, this.field_184351_n, this.playerEntity.rotationYaw, this.playerEntity.rotationPitch);
@@ -612,7 +613,10 @@
double d2 = this.playerEntity.posZ - ((double)blockpos.getZ() + 0.5D); double d2 = this.playerEntity.posZ - ((double)blockpos.getZ() + 0.5D);
double d3 = d0 * d0 + d1 * d1 + d2 * d2; double d3 = d0 * d0 + d1 * d1 + d2 * d2;
@ -20,7 +12,7 @@
{ {
return; return;
} }
@@ -670,7 +674,9 @@ @@ -670,7 +673,9 @@
if (blockpos.getY() < this.serverController.getBuildLimit() - 1 || enumfacing != EnumFacing.UP && blockpos.getY() < this.serverController.getBuildLimit()) if (blockpos.getY() < this.serverController.getBuildLimit() - 1 || enumfacing != EnumFacing.UP && blockpos.getY() < this.serverController.getBuildLimit())
{ {
@ -31,7 +23,7 @@
{ {
this.playerEntity.theItemInWorldManager.func_187251_a(this.playerEntity, worldserver, itemstack, enumhand, blockpos, enumfacing, p_184337_1_.func_187026_d(), p_184337_1_.func_187025_e(), p_184337_1_.func_187020_f()); this.playerEntity.theItemInWorldManager.func_187251_a(this.playerEntity, worldserver, itemstack, enumhand, blockpos, enumfacing, p_184337_1_.func_187026_d(), p_184337_1_.func_187025_e(), p_184337_1_.func_187020_f());
} }
@@ -689,6 +695,7 @@ @@ -689,6 +694,7 @@
if (itemstack != null && itemstack.stackSize == 0) if (itemstack != null && itemstack.stackSize == 0)
{ {
this.playerEntity.func_184611_a(enumhand, (ItemStack)null); this.playerEntity.func_184611_a(enumhand, (ItemStack)null);
@ -39,7 +31,7 @@
itemstack = null; itemstack = null;
} }
} }
@@ -703,12 +710,14 @@ @@ -703,12 +709,14 @@
if (itemstack != null) if (itemstack != null)
{ {
@ -54,7 +46,7 @@
itemstack = null; itemstack = null;
} }
} }
@@ -888,7 +897,9 @@ @@ -888,7 +896,9 @@
} }
else else
{ {
@ -65,7 +57,7 @@
this.serverController.func_184103_al().sendChatMsgImpl(itextcomponent, false); this.serverController.func_184103_al().sendChatMsgImpl(itextcomponent, false);
} }
@@ -1057,7 +1068,7 @@ @@ -1057,7 +1067,7 @@
return; return;
} }

2
src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
View File

@ -189,6 +189,8 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
{ {
completeServerSideConnection(ConnectionType.MODDED); completeServerSideConnection(ConnectionType.MODDED);
} }
// FORGE: sometimes the netqueue will tick while login is occuring, causing an NPE. We shouldn't tick until the connection is complete
if (this.playerEntity.playerNetServerHandler != this) return;
super.update(); super.update();
} }
}; };