From 806cafd070533f76d3f7587b6c0bd330c5589986 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 31 Jul 2018 15:19:18 +0100 Subject: [PATCH] Fix misapplied line in keepalive changes --- .../0018-Player-affects-spawning-API.patch | 14 +++++++------- .../0213-handle-PacketPlayInKeepAlive-async.patch | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch index 15bea38ec8..a30ec21298 100644 --- a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch @@ -1,11 +1,11 @@ -From 7dab34327d9a40e31034b6360562dbb6a85376f4 Mon Sep 17 00:00:00 2001 +From 5e793577fb3aed02f7c52c6456b482e7942d7b5b Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index fc64ba3c9..a47ef2ca5 100644 +index c5bc976c79..ca14080ccd 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -72,6 +72,9 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,7 +19,7 @@ index fc64ba3c9..a47ef2ca5 100644 // CraftBukkit start public boolean fauxSleeping; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 27c97530f..3723fd977 100644 +index 27c97530fa..3723fd9770 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -614,7 +614,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -32,7 +32,7 @@ index 27c97530f..3723fd977 100644 double d1 = entityhuman.locY - this.locY; double d2 = entityhuman.locZ - this.locZ; diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index 75040a0f2..683191c4a 100644 +index 75040a0f21..683191c4a8 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -96,7 +96,7 @@ public class EntitySilverfish extends EntityMonster { @@ -45,7 +45,7 @@ index 75040a0f2..683191c4a 100644 return false; } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index e54dcaa99..b12e767db 100644 +index e54dcaa994..b12e767db9 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -37,7 +37,7 @@ public final class SpawnerCreature { @@ -58,7 +58,7 @@ index e54dcaa99..b12e767db 100644 j = MathHelper.floor(entityhuman.locZ / 16.0D); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 38d169cc1..d0516b088 100644 +index 38d169cc14..d0516b0885 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -28,6 +28,7 @@ import org.bukkit.craftbukkit.block.data.CraftBlockData; @@ -79,7 +79,7 @@ index 38d169cc1..d0516b088 100644 if (d3 < 0.0D || d4 < d3 * d3) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3dc76f7dd..fa35a75f3 100644 +index 3dc76f7dd6..fa35a75f3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1628,7 +1628,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0213-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0213-handle-PacketPlayInKeepAlive-async.patch index 6aa086ba5d..7d37c7131d 100644 --- a/Spigot-Server-Patches/0213-handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/0213-handle-PacketPlayInKeepAlive-async.patch @@ -1,4 +1,4 @@ -From f2b3ec9db7d748b5dc17a7e00a91145efbb5fd0b Mon Sep 17 00:00:00 2001 +From ed81845dc311a451e16ea4cc3fa247dbb80c8f76 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 5 Oct 2017 01:54:07 +0100 Subject: [PATCH] handle PacketPlayInKeepAlive async @@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing random disconnections for clients. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c1dd2db89d..e8f1883c98 100644 +index c1dd2db89d..b106454447 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2471,14 +2471,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -23,7 +23,7 @@ index c1dd2db89d..e8f1883c98 100644 public void a(PacketPlayInKeepAlive packetplayinkeepalive) { - PlayerConnectionUtils.ensureMainThread(packetplayinkeepalive, this, this.player.getWorldServer()); // CraftBukkit -+ PlayerConnectionUtils.ensureMainThread(packetplayinkeepalive, this, this.player.getWorldServer()); // CraftBukkit // Paper - This shouldn't be on the main thread ++ //PlayerConnectionUtils.ensureMainThread(packetplayinkeepalive, this, this.player.getWorldServer()); // CraftBukkit // Paper - This shouldn't be on the main thread if (this.g && packetplayinkeepalive.b() == this.h) { int i = (int) (SystemUtils.b() - this.f);