From 2bfdbc4afaef5fac8b0a9fdc2afbb0a389594293 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 29 Nov 2016 18:02:20 -0600 Subject: [PATCH] Update upstream CB --- ...-Allow-Reloading-of-Command-Aliases.patch} | 4 +-- ...process-packets-from-offline-players.patch | 30 ------------------- work/CraftBukkit | 2 +- 3 files changed, 3 insertions(+), 33 deletions(-) rename Spigot-Server-Patches/{0183-Allow-Reloading-of-Command-Aliases.patch => 0182-Allow-Reloading-of-Command-Aliases.patch} (93%) delete mode 100644 Spigot-Server-Patches/0182-Don-t-process-packets-from-offline-players.patch diff --git a/Spigot-Server-Patches/0183-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0182-Allow-Reloading-of-Command-Aliases.patch similarity index 93% rename from Spigot-Server-Patches/0183-Allow-Reloading-of-Command-Aliases.patch rename to Spigot-Server-Patches/0182-Allow-Reloading-of-Command-Aliases.patch index a393b77a8b..a8d131b9d6 100644 --- a/Spigot-Server-Patches/0183-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0182-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From d47ca4a2fc9dda1259bb0a6e970598033e9fa031 Mon Sep 17 00:00:00 2001 +From 89091fadfcf6943042b97490048aa12e2d84aed5 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:21:52 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -26,5 +26,5 @@ index b24ed68..5559532 100644 // Paper end } -- -2.10.0 +2.10.2 diff --git a/Spigot-Server-Patches/0182-Don-t-process-packets-from-offline-players.patch b/Spigot-Server-Patches/0182-Don-t-process-packets-from-offline-players.patch deleted file mode 100644 index 5f95dc07bb..0000000000 --- a/Spigot-Server-Patches/0182-Don-t-process-packets-from-offline-players.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4eb6bc6c01b70d2d77fa96f5e57f5b5646a30fcc Mon Sep 17 00:00:00 2001 -From: Alfie Cleveland -Date: Sun, 27 Nov 2016 22:17:37 +0000 -Subject: [PATCH] Don't process packets from offline players - - -diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index fd08195..eb68807 100644 ---- a/src/main/java/net/minecraft/server/EntityHuman.java -+++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -12,6 +12,7 @@ import javax.annotation.Nullable; - // CraftBukkit start - import org.bukkit.craftbukkit.entity.CraftHumanEntity; - import org.bukkit.craftbukkit.entity.CraftItem; -+import org.bukkit.craftbukkit.entity.CraftPlayer; // Paper - import org.bukkit.entity.Player; - import org.bukkit.event.entity.EntityCombustByEntityEvent; - import org.bukkit.event.player.PlayerBedEnterEvent; -@@ -292,7 +293,7 @@ public abstract class EntityHuman extends EntityLiving { - } - - protected boolean isFrozen() { -- return this.getHealth() <= 0.0F || this.isSleeping(); -+ return this.getHealth() <= 0.0F || this.isSleeping() || (this.bukkitEntity != null && this.bukkitEntity instanceof CraftPlayer && !((CraftPlayer) this.bukkitEntity).isOnline()); // Paper - Pull #517 - } - - public void closeInventory() { --- -2.10.2 - diff --git a/work/CraftBukkit b/work/CraftBukkit index 41ade2f291..fffaf07113 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 41ade2f291c4596ac489606ca2b730b72b460dc2 +Subproject commit fffaf0711337e31b801c50556d1e6cf4c87c617a