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

Fixed network ticking player entity while it is dead. And explicitly prevent overworld from unloading. Closes #5978

Browse source
This commit is contained in:
LexManos 2019-07-27 02:35:06 -07:00
parent e17714583f
commit 1918148b8e
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
patches/minecraft/net/minecraft/network/play/ServerPlayNetHandler.java.patch
View file

@ -1,6 +1,14 @@
--- a/net/minecraft/network/play/ServerPlayNetHandler.java
+++ b/net/minecraft/network/play/ServerPlayNetHandler.java
@@ -337,9 +337,11 @@
@@ -180,6 +180,7 @@
public void func_73660_a() {
this.func_184342_d();
+ if (this.field_147369_b.func_70089_S()) //Don't tick players while they are dead/respawning.
this.field_147369_b.func_71127_g();
this.field_147369_b.func_70080_a(this.field_184349_l, this.field_184350_m, this.field_184351_n, this.field_147369_b.field_70177_z, this.field_147369_b.field_70125_A);
++this.field_147368_e;
@@ -337,9 +338,11 @@
}
entity.func_70080_a(d3, d4, d5, f, f1);
@ -12,7 +20,7 @@
this.field_147371_a.func_179290_a(new SMoveVehiclePacket(entity));
return;
}
@@ -839,7 +841,9 @@
@@ -839,7 +842,9 @@
Direction direction = blockraytraceresult.func_216354_b();
this.field_147369_b.func_143004_u();
if (blockpos.func_177956_o() < this.field_147367_d.func_71207_Z() - 1 || direction != Direction.UP && blockpos.func_177956_o() < this.field_147367_d.func_71207_Z()) {
@ -23,7 +31,7 @@
this.field_147369_b.field_71134_c.func_219441_a(this.field_147369_b, serverworld, itemstack, hand, blockraytraceresult);
}
} else {
@@ -959,7 +963,9 @@
@@ -959,7 +964,9 @@
if (s.startsWith("/")) {
this.func_147361_d(s);
} else {
@ -34,7 +42,7 @@
this.field_147367_d.func_184103_al().func_148544_a(itextcomponent, false);
}
@@ -1057,6 +1063,7 @@
@@ -1057,6 +1064,7 @@
this.field_147369_b.func_190775_a(entity, hand);
} else if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.INTERACT_AT) {
Hand hand1 = p_147340_1_.func_186994_b();
@ -42,7 +50,7 @@
entity.func_184199_a(this.field_147369_b, p_147340_1_.func_179712_b(), hand1);
} else if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.ATTACK) {
if (entity instanceof ItemEntity || entity instanceof ExperienceOrbEntity || entity instanceof AbstractArrowEntity || entity == this.field_147369_b) {
@@ -1087,7 +1094,7 @@
@@ -1087,7 +1095,7 @@
return;
}
@ -51,7 +59,7 @@
if (this.field_147367_d.func_71199_h()) {
this.field_147369_b.func_71033_a(GameType.SPECTATOR);
this.field_147369_b.func_71121_q().func_82736_K().func_223585_a(GameRules.field_223613_p).func_223570_a(false, this.field_147367_d);
@@ -1264,6 +1271,8 @@
@@ -1264,6 +1272,8 @@
}
public void func_147349_a(CCustomPayloadPacket p_147349_1_) {

6
src/main/java/net/minecraftforge/common/DimensionManager.java
View file

@ -219,9 +219,9 @@ public class DimensionManager
private static boolean canUnloadWorld(ServerWorld world)
{
return world.getForcedChunks().isEmpty()
return world.getDimension().getType() != DimensionType.OVERWORLD
&& world.getPlayers().isEmpty()
//&& !world.dimension.getType().shouldLoadSpawn()
&& world.getForcedChunks().isEmpty()
&& !getData(world.getDimension().getType()).keepLoaded;
}
@ -284,6 +284,7 @@ public class DimensionManager
finally
{
MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(w));
LOGGER.debug(DIMMGR, "Unloading dimension {}", id);
try {
w.close();
} catch (IOException e) {
@ -343,6 +344,7 @@ public class DimensionManager
savedEntries.clear();
@SuppressWarnings("unused")
boolean error = false;
ListNBT list = data.getList("entries", 10);
for (int x = 0; x < list.size(); x++)