From 19e9e0d647b1070dbf38adea314b7249566ef89b Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 9 Jun 2017 08:29:44 -0400 Subject: [PATCH] Update upstream --- Spigot-Server-Patches/0004-Paper-Metrics.patch | 12 ++++++------ ...figurable-Keep-Spawn-Loaded-range-per-world.patch | 10 +++++----- .../0118-Implement-PlayerLocaleChangeEvent.patch | 8 ++++---- ...elay-Chunk-Unloads-based-on-Player-Movement.patch | 8 ++++---- .../0171-Optimise-removeQueue.patch | 6 +++--- ...ethods-to-control-if-armour-stands-can-move.patch | 8 ++++---- .../0187-Properly-fix-item-duplication-bug.patch | 8 ++++---- .../0206-Do-not-let-armorstands-drown.patch | 8 ++++---- work/CraftBukkit | 2 +- work/Spigot | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Spigot-Server-Patches/0004-Paper-Metrics.patch b/Spigot-Server-Patches/0004-Paper-Metrics.patch index bdc38432b..2044e2da5 100644 --- a/Spigot-Server-Patches/0004-Paper-Metrics.patch +++ b/Spigot-Server-Patches/0004-Paper-Metrics.patch @@ -1,4 +1,4 @@ -From a233372ddf7b145969a9e17e47dfb593997857c8 Mon Sep 17 00:00:00 2001 +From 4a515602fa2dcfb95515ce32f502a744ffa01bc9 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 24 Mar 2017 23:56:01 -0500 Subject: [PATCH] Paper Metrics @@ -623,7 +623,7 @@ index 000000000..9389f9a8c + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 328ff012b..1594d7ca4 100644 +index 3d8ee9ed3..5ab2cf6ee 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -39,6 +39,7 @@ public class PaperConfig { @@ -647,10 +647,10 @@ index 328ff012b..1594d7ca4 100644 static void readConfig(Class clazz, Object instance) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index d386a876b..ba51303b2 100644 +index 80068e285..c779e035c 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -82,6 +82,7 @@ public class SpigotConfig +@@ -83,6 +83,7 @@ public class SpigotConfig MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() ); } @@ -658,7 +658,7 @@ index d386a876b..ba51303b2 100644 if ( metrics == null ) { try -@@ -93,6 +94,7 @@ public class SpigotConfig +@@ -94,6 +95,7 @@ public class SpigotConfig Bukkit.getServer().getLogger().log( Level.SEVERE, "Could not start metrics service", ex ); } } @@ -667,5 +667,5 @@ index d386a876b..ba51303b2 100644 static void readConfig(Class clazz, Object instance) -- -2.12.2 +2.13.0 diff --git a/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 062047e4b..b83a51e03 100644 --- a/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 84a75a7e512b3b03a76c8c037d941d764f70b17f Mon Sep 17 00:00:00 2001 +From 39eeed32ece9580f2212ed6f460ddcfa186985ca Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -21,7 +21,7 @@ index 74a49a5fb..3a942c763 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0e819a43c..fce7774fd 100644 +index 6e11ba5b6..71b66bbdf 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -356,8 +356,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -39,7 +39,7 @@ index 0e819a43c..fce7774fd 100644 if (i1 - j > 1000L) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 16b825884..54076b4bc 100644 +index 1276d2b8a..3e5202c41 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -3207,8 +3207,9 @@ public abstract class World implements IBlockAccess { @@ -67,10 +67,10 @@ index 522936568..a7dd7988e 100644 for (int j = -short1; j <= short1; j += 16) { for (int k = -short1; k <= short1; k += 16) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7c1bbb491..1f88cc94c 100644 +index 843a3415f..24b4a7ea7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1273,8 +1273,9 @@ public class CraftWorld implements World { +@@ -1275,8 +1275,9 @@ public class CraftWorld implements World { int chunkCoordX = chunkcoordinates.getX() >> 4; int chunkCoordZ = chunkcoordinates.getZ() >> 4; // Cycle through the 25x25 Chunks around it to load/unload the chunks. diff --git a/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch index 018c72991..823ee10e1 100644 --- a/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From dc30c4873ce988137729023b1eb33b068e7cc2e7 Mon Sep 17 00:00:00 2001 +From fd9cb0e38298f243165576d84d776b9cfa7ad869 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 59967e81e..49795c588 100644 +index 95336d6cc..1bc2ed0ec 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand; @@ -17,7 +17,7 @@ index 59967e81e..49795c588 100644 public PlayerConnection playerConnection; public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; -@@ -1223,12 +1223,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1229,12 +1229,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting { PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT); this.server.server.getPluginManager().callEvent(event); } @@ -45,7 +45,7 @@ index 59967e81e..49795c588 100644 this.cm = packetplayinsettings.d(); this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e())); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 71034f945..171e0f7bb 100644 +index 747de51d3..2569f0b7f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1693,7 +1693,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 2657b790a..168f60805 100644 --- a/Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From acf6e5cc937888e032399cb90b3ff680196356dc Mon Sep 17 00:00:00 2001 +From 0a27cc32e4ce4ca5067a78cb8d56777f9b71deae Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -35,7 +35,7 @@ index d5d6e7fcd..ef60c15bd 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index d37221f09..a639ab2a8 100644 +index 0845d1ffe..a0b5cd56b 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -30,6 +30,7 @@ public class Chunk { @@ -127,10 +127,10 @@ index 0a0b5261b..14ea89c91 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1f88cc94c..0466a4f00 100644 +index 24b4a7ea7..416e86af3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1566,7 +1566,7 @@ public class CraftWorld implements World { +@@ -1568,7 +1568,7 @@ public class CraftWorld implements World { ChunkProviderServer cps = world.getChunkProviderServer(); for (net.minecraft.server.Chunk chunk : cps.chunks.values()) { // If in use, skip it diff --git a/Spigot-Server-Patches/0171-Optimise-removeQueue.patch b/Spigot-Server-Patches/0171-Optimise-removeQueue.patch index e4bab6cd9..b7c116817 100644 --- a/Spigot-Server-Patches/0171-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0171-Optimise-removeQueue.patch @@ -1,11 +1,11 @@ -From e854876cbd6ff1a305643100e33a28703368d05c Mon Sep 17 00:00:00 2001 +From 111631601a01e9949db2fc7cb49b475c198571b5 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 13:22:40 +0000 Subject: [PATCH] Optimise removeQueue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index dac698614..5e17a13e6 100644 +index 8fb569beb..df2e607da 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -3,8 +3,10 @@ package net.minecraft.server; @@ -47,7 +47,7 @@ index dac698614..5e17a13e6 100644 this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint)); } -@@ -1097,7 +1106,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1103,7 +1112,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.lastHealthSent = -1.0F; this.ch = -1; // this.cr.a((RecipeBook) entityplayer.cr); // CraftBukkit diff --git a/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch index 70fa471b5..777e9eaaa 100644 --- a/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From b3bf4dc6b952d807ac0ae038eb7558a004f55df1 Mon Sep 17 00:00:00 2001 +From 520895780196de7a0bebecc9c7d09f4148e834b6 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 7901c0492..709c0150f 100644 +index b03245095..036498c09 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving { @@ -16,7 +16,7 @@ index 7901c0492..709c0150f 100644 public EntityArmorStand(World world) { super(world); -@@ -762,4 +763,13 @@ public class EntityArmorStand extends EntityLiving { +@@ -763,4 +764,13 @@ public class EntityArmorStand extends EntityLiving { public boolean cS() { return false; } @@ -50,5 +50,5 @@ index 2b66a08ad..8a06cb165 100644 + } } -- -2.13.1 +2.13.0 diff --git a/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch index 5f08eee09..ea2719244 100644 --- a/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From abd49c11cf42484fb6e16b88edabeb290fa5ac47 Mon Sep 17 00:00:00 2001 +From 01960d2dc1b6839c77797649fcf53ac058c9c1a0 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug @@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5e17a13e6..e05d65728 100644 +index df2e607da..13dd3dea9 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1485,7 +1485,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1491,7 +1491,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override protected boolean isFrozen() { @@ -19,7 +19,7 @@ index 5e17a13e6..e05d65728 100644 public void reset() { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 98880f980..387cfa753 100644 +index 9e1870f35..54c607176 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2680,6 +2680,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch index f802ee393..5a2dbe058 100644 --- a/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch @@ -1,14 +1,14 @@ -From 0dbdb19e62ecf0125d9ea94f1d79012236aa0400 Mon Sep 17 00:00:00 2001 +From 3c98ffa1f850acf0a181484861093621acc04b09 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Feb 2017 19:29:58 -0600 Subject: [PATCH] Do not let armorstands drown diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 709c0150f..fd518061e 100644 +index 036498c09..f25ee9061 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java -@@ -771,5 +771,10 @@ public class EntityArmorStand extends EntityLiving { +@@ -772,5 +772,10 @@ public class EntityArmorStand extends EntityLiving { super.move(moveType, x, y, z); } } @@ -41,5 +41,5 @@ index b18fc969a..3c7c43902 100644 if (this.getAirTicks() == -20) { this.setAirTicks(0); -- -2.13.1 +2.13.0 diff --git a/work/CraftBukkit b/work/CraftBukkit index bb4ae3b3b..ed8c725d1 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772 +Subproject commit ed8c725d1906b97ab83eaeef4b6acf187c90575a diff --git a/work/Spigot b/work/Spigot index ede465d4b..d5dfb24fe 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit ede465d4b574dc539984f807d2d8b37a78da1858 +Subproject commit d5dfb24fe8548399131df30df9995918bb58721e