From 4b66f1978dfe8c180ae560e75d17518d932beee3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jul 2018 13:10:15 -0400 Subject: [PATCH] Update upstream --- ...0019-Remove-invalid-mob-spawner-tile-entities.patch | 6 +++--- Spigot-Server-Patches/0028-Lighting-Queue.patch | 6 +++--- ...8-Avoid-hopper-searches-if-there-are-no-items.patch | 8 ++++---- .../0057-Add-exception-reporting-event.patch | 6 +++--- .../0086-Configurable-Chunk-Inhabited-Timer.patch | 6 +++--- .../0139-Auto-Save-Improvements.patch | 6 +++--- .../0144-Option-to-remove-corrupt-tile-entities.patch | 8 ++++---- .../0289-InventoryCloseEvent-Reason-API.patch | 8 ++++---- .../0302-Duplicate-UUID-Resolve-Option.patch | 10 +++++----- work/CraftBukkit | 2 +- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch index 9756b48932..741bf00d81 100644 --- a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,14 +1,14 @@ -From ab5cb9f6f247e8ddd7219a298e41a4f5fffab5e5 Mon Sep 17 00:00:00 2001 +From ea2724d8433bd98200623fc0b3b9c6e9c9a4f406 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 15:08:03 -0600 Subject: [PATCH] Remove invalid mob spawner tile entities diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 3b97981bc..4a4cc6c59 100644 +index 0a0d04cf6..adf3dee2e 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -777,6 +777,10 @@ public class Chunk implements IChunkAccess { +@@ -774,6 +774,10 @@ public class Chunk implements IChunkAccess { tileentity.z(); this.tileEntities.put(blockposition, tileentity); // CraftBukkit start diff --git a/Spigot-Server-Patches/0028-Lighting-Queue.patch b/Spigot-Server-Patches/0028-Lighting-Queue.patch index bd89b86ecf..ec3567f1b7 100644 --- a/Spigot-Server-Patches/0028-Lighting-Queue.patch +++ b/Spigot-Server-Patches/0028-Lighting-Queue.patch @@ -1,4 +1,4 @@ -From 6a23a851deddbd06d8dbde1734d8ebd1644fb666 Mon Sep 17 00:00:00 2001 +From 6cb336dbbff71913a308dcd2a18fc2db4c6c6c6a Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 00:52:31 -0600 Subject: [PATCH] Lighting Queue @@ -43,7 +43,7 @@ index a340866f3..1e3405cc1 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 091a53371..d46578b3e 100644 +index adf3dee2e..eb7a41977 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -91,6 +91,7 @@ public class Chunk implements IChunkAccess { @@ -84,7 +84,7 @@ index 091a53371..d46578b3e 100644 } TileEntity tileentity; -@@ -1290,6 +1300,16 @@ public class Chunk implements IChunkAccess { +@@ -1287,6 +1297,16 @@ public class Chunk implements IChunkAccess { return this.E == 8; } diff --git a/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch index 645e874428..b228cd3320 100644 --- a/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch @@ -1,4 +1,4 @@ -From ea3bad289da996b408a4296df89f75f24925f97e Mon Sep 17 00:00:00 2001 +From 95ed822af92f103ee523e42be376d2136d663b7b Mon Sep 17 00:00:00 2001 From: CullanP Date: Thu, 3 Mar 2016 02:13:38 -0600 Subject: [PATCH] Avoid hopper searches if there are no items @@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear Combined, this adds up a lot. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index b0060c363..2d55abd7a 100644 +index eb7a41977..0d80d811a 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -92,6 +92,10 @@ public class Chunk implements IChunkAccess { @@ -52,7 +52,7 @@ index b0060c363..2d55abd7a 100644 entity.setCurrentChunk(null); entityCounts.decrement(entity.entityKeyString); // Paper end -@@ -901,6 +915,15 @@ public class Chunk implements IChunkAccess { +@@ -898,6 +912,15 @@ public class Chunk implements IChunkAccess { if (!this.entitySlices[k].isEmpty()) { Iterator iterator = this.entitySlices[k].iterator(); @@ -68,7 +68,7 @@ index b0060c363..2d55abd7a 100644 while (iterator.hasNext()) { Entity entity1 = (Entity) iterator.next(); -@@ -937,7 +960,18 @@ public class Chunk implements IChunkAccess { +@@ -934,7 +957,18 @@ public class Chunk implements IChunkAccess { i = MathHelper.clamp(i, 0, this.entitySlices.length - 1); j = MathHelper.clamp(j, 0, this.entitySlices.length - 1); diff --git a/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch index 2a7408d55d..6461894025 100644 --- a/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 1bba90c8786ff7744430062680e3f9f2fb1e09be Mon Sep 17 00:00:00 2001 +From bc419c45755963ad83e1443d17994292bfa81259 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -50,7 +50,7 @@ index 000000000..93397188b +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 0c2540938..15ecac26c 100644 +index 0d80d811a..e3f7ec610 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1,5 +1,6 @@ @@ -77,7 +77,7 @@ index 0c2540938..15ecac26c 100644 public IBlockData getType(BlockPosition blockposition) { return this.getBlockData(blockposition.getX(), blockposition.getY(), blockposition.getZ()); } -@@ -806,10 +810,15 @@ public class Chunk implements IChunkAccess { +@@ -803,10 +807,15 @@ public class Chunk implements IChunkAccess { this.tileEntities.remove(blockposition); // Paper end } else { diff --git a/Spigot-Server-Patches/0086-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0086-Configurable-Chunk-Inhabited-Timer.patch index 43118563eb..4ccd7716aa 100644 --- a/Spigot-Server-Patches/0086-Configurable-Chunk-Inhabited-Timer.patch +++ b/Spigot-Server-Patches/0086-Configurable-Chunk-Inhabited-Timer.patch @@ -1,4 +1,4 @@ -From 1ab4c742c0d8d9b7da4be54e6228aca0471342e9 Mon Sep 17 00:00:00 2001 +From 3ba69a9113ba68ccbe0efb4fc90b93e7116a8a9e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Timer @@ -23,7 +23,7 @@ index 1c2209270..17fb883f6 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 1c0580f79..744b5bc6d 100644 +index 5d1812ab0..695c6d3b7 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -55,7 +55,7 @@ public class Chunk implements IChunkAccess { @@ -35,7 +35,7 @@ index 1c0580f79..744b5bc6d 100644 private int B; private final ConcurrentLinkedQueue C; public boolean d; -@@ -1231,7 +1231,7 @@ public class Chunk implements IChunkAccess { +@@ -1228,7 +1228,7 @@ public class Chunk implements IChunkAccess { } public long m() { diff --git a/Spigot-Server-Patches/0139-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0139-Auto-Save-Improvements.patch index 75d9199035..ee10df8e03 100644 --- a/Spigot-Server-Patches/0139-Auto-Save-Improvements.patch +++ b/Spigot-Server-Patches/0139-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From b790f76209c8a401084cc4d03b4c78164ee79c41 Mon Sep 17 00:00:00 2001 +From 10a2933aa9c03c4525c9e19672a5532ea55965e4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Sep 2016 23:16:39 -0400 Subject: [PATCH] Auto Save Improvements @@ -64,7 +64,7 @@ index 0e6c18b32..c182ceffb 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 99421aca9..ee992e346 100644 +index c27073d27..06d6814b8 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -52,9 +52,9 @@ public class Chunk implements IChunkAccess { @@ -79,7 +79,7 @@ index 99421aca9..ee992e346 100644 private int z; private long A; public long getInhabitedTime() { return A; } // Paper - OBFHELPER private int B; -@@ -1013,11 +1013,11 @@ public class Chunk implements IChunkAccess { +@@ -1010,11 +1010,11 @@ public class Chunk implements IChunkAccess { if (this.w && this.world.getTime() != this.lastSaved || this.y) { return true; } diff --git a/Spigot-Server-Patches/0144-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0144-Option-to-remove-corrupt-tile-entities.patch index 445794536d..0445b2649d 100644 --- a/Spigot-Server-Patches/0144-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0144-Option-to-remove-corrupt-tile-entities.patch @@ -1,4 +1,4 @@ -From 04a43a703bb0f5eef6a82418f681d69837c38f6e Mon Sep 17 00:00:00 2001 +From 2a9a58bbd5fc82a274e2189b2fd43d7719e6c64c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 5 Oct 2016 16:27:36 -0500 Subject: [PATCH] Option to remove corrupt tile entities @@ -19,10 +19,10 @@ index c182ceffb..9a2ec0793 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 5163bd11b..f31524eb0 100644 +index 06d6814b8..7a797bef0 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -832,6 +832,12 @@ public class Chunk implements IChunkAccess { +@@ -829,6 +829,12 @@ public class Chunk implements IChunkAccess { "Chunk coordinates: " + (this.locX * 16) + "," + (this.locZ * 16)); e.printStackTrace(); ServerInternalException.reportInternalException(e); @@ -35,7 +35,7 @@ index 5163bd11b..f31524eb0 100644 // Paper end // CraftBukkit end } -@@ -841,6 +847,7 @@ public class Chunk implements IChunkAccess { +@@ -838,6 +844,7 @@ public class Chunk implements IChunkAccess { this.i.put(new BlockPosition(nbttagcompound.getInt("x"), nbttagcompound.getInt("y"), nbttagcompound.getInt("z")), nbttagcompound); } diff --git a/Spigot-Server-Patches/0289-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0289-InventoryCloseEvent-Reason-API.patch index 4dc1a88f01..911d167e92 100644 --- a/Spigot-Server-Patches/0289-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0289-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From a110ff1f46dcdda93c0d692af44fd4d36b0dbc26 Mon Sep 17 00:00:00 2001 +From bb581a508ed49e47db77cfe8cd9a3fb642b03acc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,10 +7,10 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index a5a63a01d..e504b7858 100644 +index 7a797bef0..7a7d65692 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -886,7 +886,7 @@ public class Chunk implements IChunkAccess { +@@ -883,7 +883,7 @@ public class Chunk implements IChunkAccess { { if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity ) { @@ -19,7 +19,7 @@ index a5a63a01d..e504b7858 100644 } } } -@@ -911,7 +911,7 @@ public class Chunk implements IChunkAccess { +@@ -908,7 +908,7 @@ public class Chunk implements IChunkAccess { { if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity ) { diff --git a/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch index 26686fc3b3..f0315797f8 100644 --- a/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From 5f6f08cc867183a3e8e3e5d52a3d31d030100e4c Mon Sep 17 00:00:00 2001 +From 92a07e301c03b31ac531b25614d11b10168c3ae8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option @@ -78,7 +78,7 @@ index 7bd7aa0d9..ba6d5b7ff 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 03afa1236..1f50004cb 100644 +index b37fa3829..c56e435b1 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1,5 +1,10 @@ @@ -108,7 +108,7 @@ index 03afa1236..1f50004cb 100644 } int k = MathHelper.floor(entity.locY / 16.0D); -@@ -868,6 +875,37 @@ public class Chunk implements IChunkAccess { +@@ -865,6 +872,37 @@ public class Chunk implements IChunkAccess { for (int j = 0; j < i; ++j) { List entityslice = aentityslice[j]; // Spigot @@ -147,7 +147,7 @@ index 03afa1236..1f50004cb 100644 this.world.a((Collection) entityslice); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d725bf13e..7154692ee 100644 +index be3b1f096..6eceb1dce 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2735,6 +2735,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -159,7 +159,7 @@ index d725bf13e..7154692ee 100644 this.uniqueID = uuid; this.au = this.uniqueID.toString(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 013f4eef5..b9d03d801 100644 +index 747d99dbe..7a9f28421 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -40,7 +40,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/work/CraftBukkit b/work/CraftBukkit index 4e2f571337..1c7adf74e4 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 4e2f57133714acc3f84bec56d8ebcbcfc0228326 +Subproject commit 1c7adf74e45bb83545603c1e4b7974ad979c442c