mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 04:09:51 +00:00
This includes three commits from 1.12.x: https://github.com/MinecraftForge/MinecraftForge/commit/c20a5e8805f64097430cf0722011f20862a8df9c https://github.com/MinecraftForge/MinecraftForge/commit/93b704b459c6f537d3b1651008c49ce1db2e0ca1 https://github.com/MinecraftForge/MinecraftForge/commit/ee0d43bbde37e258c36de1003436dbe3fcf88077 Scatter gun patches to improve entity tracking and position tracking. Provided by Aikar through the Paper project, this commit of patches combines the following patches: https://github.com/PaperMC/Paper/blob/fd1bd5223a461b6d98280bb8f2d67280a30dd24a/Spigot-Server-Patches/0306-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch https://github.com/PaperMC/Paper/blob/fd1bd5223a461b6d98280bb8f2d67280a30dd24a/Spigot-Server-Patches/0315-Always-process-chunk-registration-after-moving.patch https://github.com/PaperMC/Paper/blob/fd1bd5223a461b6d98280bb8f2d67280a30dd24a/Spigot-Server-Patches/0335-Ensure-chunks-are-always-loaded-on-hard-position-set.patch https://github.com/PaperMC/Paper/blob/fd1bd5223a461b6d98280bb8f2d67280a30dd24a/Spigot-Server-Patches/0378-Sync-Player-Position-to-Vehicles.patch Co-authored-by: Gabriel Harris-Rouquette <[email protected]>
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
--- a/net/minecraft/network/NetHandlerPlayServer.java
|
|
+++ b/net/minecraft/network/NetHandlerPlayServer.java
|
|
@@ -327,9 +327,11 @@
|
|
}
|
|
|
|
entity.func_70080_a(d3, d4, d5, f, f1);
|
|
+ this.field_147369_b.func_70080_a(d3, d4, d5, this.field_147369_b.field_70177_z, this.field_147369_b.field_70125_A); // Forge - Resync player position on vehicle moving
|
|
boolean flag2 = worldserver.func_195586_b(entity, entity.func_174813_aQ().func_186664_h(0.0625D));
|
|
if (flag && (flag1 || !flag2)) {
|
|
entity.func_70080_a(d0, d1, d2, f, f1);
|
|
+ this.field_147369_b.func_70080_a(d0, d1, d2, this.field_147369_b.field_70177_z, this.field_147369_b.field_70125_A); // Forge - Resync player position on vehicle moving
|
|
this.field_147371_a.func_179290_a(new SPacketMoveVehicle(entity));
|
|
return;
|
|
}
|
|
@@ -1265,5 +1267,7 @@
|
|
}
|
|
|
|
public void func_147349_a(CPacketCustomPayload p_147349_1_) {
|
|
+ PacketThreadUtil.func_180031_a(p_147349_1_, this, this.field_147369_b.func_71121_q());
|
|
+ net.minecraftforge.fml.network.NetworkHooks.onCustomPayload(p_147349_1_, this.field_147371_a);
|
|
}
|
|
}
|