From 85bfc4508ace5da07e482d66c487fc4ca51d8d5e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 7 Aug 2018 10:51:42 -0400 Subject: [PATCH] [CI-SKIP] [Auto] Rebuild Patches A recent commit has been made that caused patches to be out of order, rebuilding --- ...NTPrimeEvent.patch => 0133-Add-TNTPrimeEvent.patch} | 2 +- ...0134-Provide-Chunk-Coordinates-as-a-Long-API.patch} | 4 ++-- ...MC-135506-Experience-should-save-as-Integers.patch} | 4 ++-- ...ixes.patch => 0331-Entity-add-to-world-fixes.patch} | 8 ++++---- ...2-Fix-client-rendering-skulls-from-same-user.patch} | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) rename Spigot-API-Patches/{0132-Add-TNTPrimeEvent.patch => 0133-Add-TNTPrimeEvent.patch} (98%) rename Spigot-API-Patches/{0133-Provide-Chunk-Coordinates-as-a-Long-API.patch => 0134-Provide-Chunk-Coordinates-as-a-Long-API.patch} (95%) rename Spigot-Server-Patches/{0329-MC-135506-Experience-should-save-as-Integers.patch => 0330-MC-135506-Experience-should-save-as-Integers.patch} (92%) rename Spigot-Server-Patches/{0330-Entity-add-to-world-fixes.patch => 0331-Entity-add-to-world-fixes.patch} (95%) rename Spigot-Server-Patches/{0331-Fix-client-rendering-skulls-from-same-user.patch => 0332-Fix-client-rendering-skulls-from-same-user.patch} (96%) diff --git a/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0133-Add-TNTPrimeEvent.patch similarity index 98% rename from Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch rename to Spigot-API-Patches/0133-Add-TNTPrimeEvent.patch index 387805ff1..38f48a51f 100644 --- a/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch +++ b/Spigot-API-Patches/0133-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From 0b3922d6b50b4f35e5c0dd10d730d600a84924a8 Mon Sep 17 00:00:00 2001 +From de75e8ea0d047e0bf404ca6131f2aa21c6d46cd5 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 15 Jul 2018 22:17:55 +0300 Subject: [PATCH] Add TNTPrimeEvent diff --git a/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 95% rename from Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch rename to Spigot-API-Patches/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch index 038700977..9002b6fc3 100644 --- a/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch +++ b/Spigot-API-Patches/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch @@ -1,4 +1,4 @@ -From 3c052011825aa3a6ec76c415b446525a0d9d350b Mon Sep 17 00:00:00 2001 +From 264867ed8aaad89877a3934ff8c8bcd6e226f3ef Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 4 Aug 2018 19:37:35 -0400 Subject: [PATCH] Provide Chunk Coordinates as a Long API @@ -27,7 +27,7 @@ index 079b9feb..c75bce07 100644 * Gets the world containing this chunk * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 121033e9..050ecae1 100644 +index b8381d2e..73825a37 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -137,6 +137,21 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-Server-Patches/0329-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0330-MC-135506-Experience-should-save-as-Integers.patch similarity index 92% rename from Spigot-Server-Patches/0329-MC-135506-Experience-should-save-as-Integers.patch rename to Spigot-Server-Patches/0330-MC-135506-Experience-should-save-as-Integers.patch index d23235bb5..4dbafa9b2 100644 --- a/Spigot-Server-Patches/0329-MC-135506-Experience-should-save-as-Integers.patch +++ b/Spigot-Server-Patches/0330-MC-135506-Experience-should-save-as-Integers.patch @@ -1,11 +1,11 @@ -From b69638bbdc2a5ee083b492643e8e63d66dfba96e Mon Sep 17 00:00:00 2001 +From aed96565d2565b8718348d9f2a869e48ee319ef9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 00:04:54 -0400 Subject: [PATCH] MC-135506: Experience should save as Integers diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index b8bfc75771..13299ad102 100644 +index b8bfc7577..13299ad10 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -205,14 +205,14 @@ public class EntityExperienceOrb extends Entity { diff --git a/Spigot-Server-Patches/0330-Entity-add-to-world-fixes.patch b/Spigot-Server-Patches/0331-Entity-add-to-world-fixes.patch similarity index 95% rename from Spigot-Server-Patches/0330-Entity-add-to-world-fixes.patch rename to Spigot-Server-Patches/0331-Entity-add-to-world-fixes.patch index bebdb24c2..0f06a767d 100644 --- a/Spigot-Server-Patches/0330-Entity-add-to-world-fixes.patch +++ b/Spigot-Server-Patches/0331-Entity-add-to-world-fixes.patch @@ -1,4 +1,4 @@ -From 65f1544c78789ea0348d7059d8d6f82f130155e4 Mon Sep 17 00:00:00 2001 +From 35f5865d3457adf2d280dc4e7c94864a63d46dc3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 22:47:46 -0400 Subject: [PATCH] Entity add to world fixes @@ -14,7 +14,7 @@ Fix this by differing entity add to world for all entities at the same time the original entity is dead, overwrite it as the logic does for unloaod queued entities. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index e510940ab3..db8fbc006d 100644 +index e510940ab..db8fbc006 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -902,6 +902,7 @@ public class Chunk implements IChunkAccess { @@ -41,7 +41,7 @@ index e510940ab3..db8fbc006d 100644 // CraftBukkit start org.bukkit.Server server = this.world.getServer(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b0053e5e63..004c3ec474 100644 +index b0053e5e6..004c3ec47 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1069,6 +1069,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose @@ -70,7 +70,7 @@ index b0053e5e63..004c3ec474 100644 } this.entityList.add(entity); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7a9f28421b..6412715b78 100644 +index 7a9f28421..6412715b7 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -992,7 +992,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/Spigot-Server-Patches/0331-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0332-Fix-client-rendering-skulls-from-same-user.patch similarity index 96% rename from Spigot-Server-Patches/0331-Fix-client-rendering-skulls-from-same-user.patch rename to Spigot-Server-Patches/0332-Fix-client-rendering-skulls-from-same-user.patch index a709f62ac..30b935c7c 100644 --- a/Spigot-Server-Patches/0331-Fix-client-rendering-skulls-from-same-user.patch +++ b/Spigot-Server-Patches/0332-Fix-client-rendering-skulls-from-same-user.patch @@ -1,4 +1,4 @@ -From b5439078d7f958538efb240ff77b43e3a3d7250c Mon Sep 17 00:00:00 2001 +From dadb22cbfff595f7260cec7213f04b13e7be3e2a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Nov 2016 00:40:42 -0500 Subject: [PATCH] Fix client rendering skulls from same user @@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user, for when different skins were used when skull was made. diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index e52014fd8f..da11ec1672 100644 +index e52014fd8..da11ec167 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -44,7 +44,7 @@ public final class ItemStack { @@ -25,7 +25,7 @@ index e52014fd8f..da11ec1672 100644 private EntityItemFrame i; private ShapeDetectorBlock j; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index d04afceb70..b0e8ffc4b1 100644 +index d04afceb7..b0e8ffc4b 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -251,6 +251,15 @@ public class PacketDataSerializer extends ByteBuf { @@ -62,7 +62,7 @@ index d04afceb70..b0e8ffc4b1 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 1aa36156a8..c5f0b85309 100644 +index 1aa36156a..c5f0b8530 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -38,6 +38,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -83,7 +83,7 @@ index 1aa36156a8..c5f0b85309 100644 } diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 85fd8dab60..16a5537ce0 100644 +index 85fd8dab6..16a5537ce 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -143,9 +143,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa