Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 09:27:45 +01:00
Code Issues Projects Releases Wiki Activity

[Auto] Rebuild Patches

Browse Source 
A recent commit has been made that caused patches to be out of order, rebuilding
This commit is contained in:
Aikar 2018-08-05 18:55:03 -04:00
parent adcd0c1505
commit a4e7bdb306
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
23 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-API-Patches/0127-SkeletonHorse-Additions.patch → Spigot-API-Patches/0128-SkeletonHorse-Additions.patch
View File

@ -1,4 +1,4 @@
From 9bff75502f5c0651e30841d8dc67f4139a126601 Mon Sep 17 00:00:00 2001
From a8ee859d2eaaefabf9f95aad32589825cfb68981 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 27 Jul 2018 22:36:17 -0500
Subject: [PATCH] SkeletonHorse Additions
@ -72,5 +72,5 @@ index b2c6b6a8..ba998346 100644
+ // Paper end
+}
--
2.11.0
2.18.0

2
Spigot-API-Patches/0128-Expand-Location-Manipulation-API.patch → Spigot-API-Patches/0129-Expand-Location-Manipulation-API.patch
View File

@ -1,4 +1,4 @@
From 6771e034d702256481db7832fa45c13d0bbeb47c Mon Sep 17 00:00:00 2001
From c099f3364056fc23f1394a1cfcba17e229b1f082 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 25 Jul 2018 01:36:07 -0400
Subject: [PATCH] Expand Location Manipulation API

2
Spigot-API-Patches/0129-Expand-ArmorStand-API.patch → Spigot-API-Patches/0130-Expand-ArmorStand-API.patch
View File

@ -1,4 +1,4 @@
From 903ef20f911aefe950c3b48f2731c805a09ad6d9 Mon Sep 17 00:00:00 2001
From 5a23a70f98ba4d43a2a3ea02a6265bcbb5cb11c7 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Thu, 26 Jul 2018 02:22:44 -0400
Subject: [PATCH] Expand ArmorStand API

2
Spigot-API-Patches/0130-AnvilDamageEvent.patch → Spigot-API-Patches/0131-AnvilDamageEvent.patch
View File

@ -1,4 +1,4 @@
From 813d60f7b48916f251222be3ca99019797eb7f04 Mon Sep 17 00:00:00 2001
From 8a3a59da5ab19bd6129293e325dd0ba039947628 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 20 Jul 2018 23:36:55 -0500
Subject: [PATCH] AnvilDamageEvent

4
Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch → Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch
View File

@ -1,4 +1,4 @@
From c816abc8a84fbbd722a1149988a426854c2daaaa Mon Sep 17 00:00:00 2001
From 0b3922d6b50b4f35e5c0dd10d730d600a84924a8 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Sun, 15 Jul 2018 22:17:55 +0300
Subject: [PATCH] Add TNTPrimeEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
new file mode 100644
index 000000000..4f8d5d2db
index 00000000..4f8d5d2d
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
@@ -0,0 +1,108 @@

6
Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch → Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
View File

@ -1,4 +1,4 @@
From a4811eb06bd903e31c3238bacb6db13036de7370 Mon Sep 17 00:00:00 2001
From 3c052011825aa3a6ec76c415b446525a0d9d350b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 4 Aug 2018 19:37:35 -0400
Subject: [PATCH] Provide Chunk Coordinates as a Long API
@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method
to look up by the long key too.
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
index 079b9febe..c75bce07a 100644
index 079b9feb..c75bce07 100644
--- a/src/main/java/org/bukkit/Chunk.java
+++ b/src/main/java/org/bukkit/Chunk.java
@@ -23,6 +23,15 @@ public interface Chunk {
@ -27,7 +27,7 @@ index 079b9febe..c75bce07a 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 121033e90..050ecae16 100644
index 121033e9..050ecae1 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 {

10
Spigot-Server-Patches/0315-SkeletonHorse-Additions.patch → Spigot-Server-Patches/0316-SkeletonHorse-Additions.patch
View File

@ -1,11 +1,11 @@
From 3cd11a4c4b611ce91d5dfb1e75c0f1e1e460f4a5 Mon Sep 17 00:00:00 2001
From 284660a2c1fdcdbdb93b49104ce21c04d473c93c Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 27 Jul 2018 22:36:31 -0500
Subject: [PATCH] SkeletonHorse Additions
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
index 70985bf52..9fb86eefd 100644
index 70985bf5..9fb86eef 100644
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@ -31,7 +31,7 @@ index 70985bf52..9fb86eefd 100644
if (flag != this.bN) {
this.bN = flag;
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
index f69170559..cba8b91e5 100644
index f6917055..cba8b91e 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
@@ -13,6 +13,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@ -43,7 +43,7 @@ index f69170559..cba8b91e5 100644
this.a.s(false);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
index e822c2200..496d0c0ca 100644
index e822c220..496d0c0c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
@@ -26,4 +26,23 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
@ -71,5 +71,5 @@ index e822c2200..496d0c0ca 100644
+ // Paper end
}
--
2.11.0
2.18.0

4
Spigot-Server-Patches/0316-Prevent-Saving-Bad-entities-to-chunks.patch → Spigot-Server-Patches/0317-Prevent-Saving-Bad-entities-to-chunks.patch
View File

@ -1,4 +1,4 @@
From 7802ea3ea3915637d1e5bd381e15eefbb08a487c Mon Sep 17 00:00:00 2001
From 6bd58c3df2c3fb451f419dcacd438c2208381867 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 26 Jul 2018 00:11:12 -0400
Subject: [PATCH] Prevent Saving Bad entities to chunks
@ -18,7 +18,7 @@ an invalid entity.
This should reduce log occurrences of dupe uuid messages.
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index a97e024ec4..bd52bf6561 100644
index a97e024e..bd52bf65 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -561,11 +561,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {

6
Spigot-Server-Patches/0317-Don-t-call-getItemMeta-on-hasItemMeta.patch → Spigot-Server-Patches/0318-Don-t-call-getItemMeta-on-hasItemMeta.patch
View File

@ -1,4 +1,4 @@
From 61eb7432605c0b3780d1a9ecfd95a0112be202f7 Mon Sep 17 00:00:00 2001
From 382ea8e7c49227b584971b8f3d29bdc93505dd7c Mon Sep 17 00:00:00 2001
From: Hugo Manrique <hugmanrique@gmail.com>
Date: Thu, 26 Jul 2018 14:10:23 +0200
Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 8ca161f0ed..e9bef85c8b 100644
index 8ca161f0..e9bef85c 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -514,7 +514,7 @@ public final class CraftItemStack extends ItemStack {
@ -24,7 +24,7 @@ index 8ca161f0ed..e9bef85c8b 100644
static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
index eb6cf1bb33..79ce3752e8 100644
index eb6cf1bb..79ce3752 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
@@ -5,6 +5,7 @@ import static org.hamcrest.Matchers.*;

4
Spigot-Server-Patches/0318-Always-process-chunk-removal-in-removeEntity.patch → Spigot-Server-Patches/0319-Always-process-chunk-removal-in-removeEntity.patch
View File

@ -1,4 +1,4 @@
From 9cdc39234556fddc6c3fcb347f2ffd44ee7719b5 Mon Sep 17 00:00:00 2001
From a52bf404ca97594f73558a6cd477bdc6adb1f4e6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 28 Jul 2018 12:09:20 -0400
Subject: [PATCH] Always process chunk removal in removeEntity
@ -8,7 +8,7 @@ which can keep them in the chunk when they shouldnt be if done
during entity ticking.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0f2dadfa39..f6531d4fea 100644
index 921add1d..ff0112c5 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1136,7 +1136,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

10
Spigot-Server-Patches/0319-Ignore-Dead-Entities-in-entityList-iteration.patch → Spigot-Server-Patches/0320-Ignore-Dead-Entities-in-entityList-iteration.patch
View File

@ -1,4 +1,4 @@
From 6a6de194fc8ecd5e1b3a764440d9394100ae96dd Mon Sep 17 00:00:00 2001
From 0b35c943d3d7f72d70e6de72ef394fdb6816cf68 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 28 Jul 2018 12:18:27 -0400
Subject: [PATCH] Ignore Dead Entities in entityList iteration
@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
they shouldn't of been in the list in the first place.
diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
index 7ff8e70b24..4e854c6dbe 100644
index 7ff8e70b..4e854c6d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
@@ -172,6 +172,7 @@ public class PaperCommand extends Command {
@ -23,7 +23,7 @@ index 7ff8e70b24..4e854c6dbe 100644
MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 785c31089e..6b0ca4eb98 100644
index 785c3108..6b0ca4eb 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -122,6 +122,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -35,7 +35,7 @@ index 785c31089e..6b0ca4eb98 100644
public float length;
public float J;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f6531d4fea..e9da359e93 100644
index ff0112c5..82f4f00a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1078,6 +1078,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@ -71,7 +71,7 @@ index f6531d4fea..e9da359e93 100644
if (entity instanceof EntityInsentient) {
EntityInsentient entityinsentient = (EntityInsentient) entity;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f4dc7e4ac6..8923df898f 100644
index f4dc7e4a..8923df89 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -660,6 +660,7 @@ public class CraftWorld implements World {

10
Spigot-Server-Patches/0320-Always-process-chunk-registration-after-moving.patch → Spigot-Server-Patches/0321-Always-process-chunk-registration-after-moving.patch
View File

@ -1,4 +1,4 @@
From 7397f8f996dcff94bd805f8fe91c2b87d76d42f1 Mon Sep 17 00:00:00 2001
From 850efc703ad3dbde1bce388cacba59d30c6435dd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 29 Jul 2018 11:58:05 -0400
Subject: [PATCH] Always process chunk registration after moving
@ -7,7 +7,7 @@ This will help guarantee that entities are always in the
chunk that they are currently located at.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 6b0ca4eb9..68b4a902e 100644
index 6b0ca4eb..68b4a902 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -340,6 +340,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -27,7 +27,7 @@ index 6b0ca4eb9..68b4a902e 100644
protected SoundEffect ad() {
diff --git a/src/main/java/net/minecraft/server/EntityLeash.java b/src/main/java/net/minecraft/server/EntityLeash.java
index f2d3d0b4c..f20060614 100644
index f2d3d0b4..f2006061 100644
--- a/src/main/java/net/minecraft/server/EntityLeash.java
+++ b/src/main/java/net/minecraft/server/EntityLeash.java
@@ -31,6 +31,7 @@ public class EntityLeash extends EntityHanging {
@ -39,7 +39,7 @@ index f2d3d0b4c..f20060614 100644
public void setDirection(EnumDirection enumdirection) {}
diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
index 95c6cd897..bc11e7da2 100644
index 95c6cd89..bc11e7da 100644
--- a/src/main/java/net/minecraft/server/EntityShulker.java
+++ b/src/main/java/net/minecraft/server/EntityShulker.java
@@ -385,6 +385,7 @@ public class EntityShulker extends EntityGolem implements IMonster {
@ -51,5 +51,5 @@ index 95c6cd897..bc11e7da2 100644
this.lastY = this.locY;
this.lastZ = this.locZ;
--
2.17.1
2.18.0

10
Spigot-Server-Patches/0321-Provide-option-to-use-a-versioned-world-folder-for-t.patch → Spigot-Server-Patches/0322-Provide-option-to-use-a-versioned-world-folder-for-t.patch
View File

@ -1,4 +1,4 @@
From af897c1497575fd6fd1f25b0bc644264f4d7127f Mon Sep 17 00:00:00 2001
From 2acb3f399afdec8d5434220c7098e50b513d42c8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 29 Jul 2018 15:48:50 -0400
Subject: [PATCH] Provide option to use a versioned world folder for testing
@ -19,7 +19,7 @@ may be some delay there, but region files are only copied on demand.
This is highly experiemental so backup your world before relying on this to not modify it
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 5a17ce3d22..f7ece47ed9 100644
index bcdf4f91..c457d071 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -13,6 +13,7 @@ import java.util.List;
@ -59,7 +59,7 @@ index 5a17ce3d22..f7ece47ed9 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index bd52bf6561..54840851ba 100644
index bd52bf65..54840851 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -55,8 +55,56 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -146,7 +146,7 @@ index bd52bf6561..54840851ba 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index 609d6c3550..f1fa7c7177 100644
index 609d6c35..f1fa7c71 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -74,6 +74,13 @@ public class RegionFileCache {
@ -164,7 +164,7 @@ index 609d6c3550..f1fa7c7177 100644
public static synchronized void a() {
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
index 9a243010d0..3fabbe94f9 100644
index 9a243010..3fabbe94 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -33,6 +33,58 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {

6
Spigot-Server-Patches/0322-MC-111480-Start-Entity-ID-s-at-1.patch → Spigot-Server-Patches/0323-MC-111480-Start-Entity-ID-s-at-1.patch
View File

@ -1,4 +1,4 @@
From 28bf6810434ad2518f42c9fd90582a0e53790baf Mon Sep 17 00:00:00 2001
From 9af17d5047c9f2c8ed932832e91c87df656cb1bd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 29 Jul 2018 22:58:47 -0400
Subject: [PATCH] MC-111480: Start Entity ID's at 1
@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
and can break things such as Elytra Fireworks.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 68b4a902e..ce33cd5b8 100644
index 68b4a902..ce33cd5b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -91,7 +91,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -20,5 +20,5 @@ index 68b4a902e..ce33cd5b8 100644
private int id;
public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
--
2.17.1
2.18.0

6
Spigot-Server-Patches/0323-Implement-Expanded-ArmorStand-API.patch → Spigot-Server-Patches/0324-Implement-Expanded-ArmorStand-API.patch
View File

@ -1,4 +1,4 @@
From 977c05ac1ba9db6d8adbddf1e53bca3c26661a7d Mon Sep 17 00:00:00 2001
From 4de2b34d5e061b131e5c506f81880d9a8c93691c Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Thu, 26 Jul 2018 02:25:46 -0400
Subject: [PATCH] Implement Expanded ArmorStand API
@ -8,7 +8,7 @@ Add the following:
- Enable/Disable slot interactions
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index e9a746f138..3b2b94d8c6 100644
index e9a746f1..3b2b94d8 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@ -29,7 +29,7 @@ index e9a746f138..3b2b94d8c6 100644
return (this.bH & 1 << enumitemslot.c()) != 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index 124c3185bc..9f5c3b92e3 100644
index 124c3185..9f5c3b92 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {

4
Spigot-Server-Patches/0324-AnvilDamageEvent.patch → Spigot-Server-Patches/0325-AnvilDamageEvent.patch
View File

@ -1,11 +1,11 @@
From 453d41b94e3ac15af479ff88fe2431cd2b46adda Mon Sep 17 00:00:00 2001
From a51c1c92fd1c655e287f0e78164c61c894266c73 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 20 Jul 2018 23:37:03 -0500
Subject: [PATCH] AnvilDamageEvent
diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
index fb3413d81e..9f20348d0c 100644
index fb3413d8..9f20348d 100644
--- a/src/main/java/net/minecraft/server/ContainerAnvil.java
+++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
@@ -73,6 +73,16 @@ public class ContainerAnvil extends Container {

4
Spigot-Server-Patches/0325-World-EntityHuman-Lookup-Optimizations.patch → Spigot-Server-Patches/0326-World-EntityHuman-Lookup-Optimizations.patch
View File

@ -1,11 +1,11 @@
From a297d6fe589e774f7342aab72841f8cd259ac4a7 Mon Sep 17 00:00:00 2001
From ac0033b8223c425d0c0830737002b387d547b36c Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 30 Jul 2018 02:42:49 -0400
Subject: [PATCH] World EntityHuman Lookup Optimizations
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e9da359e93..a370934684 100644
index 82f4f00a..b0053e5e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -79,6 +79,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

8
Spigot-Server-Patches/0326-Add-TNTPrimeEvent.patch → Spigot-Server-Patches/0327-Add-TNTPrimeEvent.patch
View File

@ -1,11 +1,11 @@
From ee6a88abd75b0cbca05989c5489a83a55f278774 Mon Sep 17 00:00:00 2001
From f5d469b41ad50cd2225a1a308dab1700507f82b3 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Mon, 16 Jul 2018 00:05:05 +0300
Subject: [PATCH] Add TNTPrimeEvent
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
index 25a8a1afdf..108006d580 100644
index 25a8a1af..108006d5 100644
--- a/src/main/java/net/minecraft/server/BlockFire.java
+++ b/src/main/java/net/minecraft/server/BlockFire.java
@@ -2,6 +2,7 @@ package net.minecraft.server;
@ -37,7 +37,7 @@ index 25a8a1afdf..108006d580 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
index 0c48a0cfe6..c3eeee2634 100644
index 0c48a0cf..c3eeee26 100644
--- a/src/main/java/net/minecraft/server/BlockTNT.java
+++ b/src/main/java/net/minecraft/server/BlockTNT.java
@@ -1,6 +1,7 @@
@ -110,7 +110,7 @@ index 0c48a0cfe6..c3eeee2634 100644
world.setAir(blockposition);
}
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index d8ab87e216..d5e2a02516 100644
index d8ab87e2..d5e2a025 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -9,6 +9,7 @@ import org.apache.logging.log4j.Logger;

6
Spigot-Server-Patches/0327-Break-up-and-make-tab-spam-limits-configurable.patch → Spigot-Server-Patches/0328-Break-up-and-make-tab-spam-limits-configurable.patch
View File

@ -1,4 +1,4 @@
From cb340ef9e7dcd0c004a49efdc66336cfd9020c84 Mon Sep 17 00:00:00 2001
From e0cdf659da7f722372944ac41f54f8ecd39d088a Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 29 Jul 2018 05:02:15 +0100
Subject: [PATCH] Break up and make tab spam limits configurable
@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
plugins doing unsafe things.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index c457d07110..046bf33f66 100644
index c457d071..046bf33f 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -327,4 +327,18 @@ public class PaperConfig {
@ -45,7 +45,7 @@ index c457d07110..046bf33f66 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a405cc0a2a..766f033d75 100644
index f7401f5c..6ebc0a95 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

12
Spigot-Server-Patches/0328-Make-portal-teleportation-adjustment-math-more-accur.patch → Spigot-Server-Patches/0329-Make-portal-teleportation-adjustment-math-more-accur.patch
View File

@ -1,11 +1,11 @@
From 7a62941977f7d8b8ebb5ca2742e389fed0763274 Mon Sep 17 00:00:00 2001
From 5a571e2f843a929a40427366952f72d8ddabee02 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 31 Jul 2018 19:32:57 -0500
Subject: [PATCH] Make portal teleportation adjustment math more accurate
diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
index 854ad49b6..3ee310a9a 100644
index 854ad49b..3ee310a9 100644
--- a/src/main/java/net/minecraft/server/EnumDirection.java
+++ b/src/main/java/net/minecraft/server/EnumDirection.java
@@ -85,6 +85,7 @@ public enum EnumDirection implements INamable {
@ -33,7 +33,7 @@ index 854ad49b6..3ee310a9a 100644
return this.c;
}
diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
index f52b9c6f0..3adbfb820 100644
index f52b9c6f..3adbfb82 100644
--- a/src/main/java/net/minecraft/server/MathHelper.java
+++ b/src/main/java/net/minecraft/server/MathHelper.java
@@ -82,6 +82,7 @@ public class MathHelper {
@ -45,7 +45,7 @@ index f52b9c6f0..3adbfb820 100644
return d0 < d1 ? d1 : (d0 > d2 ? d2 : d0);
}
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index ba8d15431..6d2f5faf2 100644
index 7444f462..16ca3209 100644
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -208,11 +208,27 @@ public class PortalTravelAgent {
@ -79,7 +79,7 @@ index ba8d15431..6d2f5faf2 100644
float f1 = 0.0F;
float f2 = 0.0F;
diff --git a/src/main/java/net/minecraft/server/ShapeDetector.java b/src/main/java/net/minecraft/server/ShapeDetector.java
index 3faf74a22..4e1f8c211 100644
index 3faf74a2..4e1f8c21 100644
--- a/src/main/java/net/minecraft/server/ShapeDetector.java
+++ b/src/main/java/net/minecraft/server/ShapeDetector.java
@@ -140,6 +140,7 @@ public class ShapeDetector {
@ -91,5 +91,5 @@ index 3faf74a22..4e1f8c211 100644
return this.e;
}
--
2.17.1
2.18.0

4
Spigot-Server-Patches/0329-MC-135506-Experience-should-save-as-Integers.patch → Spigot-Server-Patches/0330-MC-135506-Experience-should-save-as-Integers.patch
View File

@ -1,11 +1,11 @@
From 59d357424f02eb0ccb9a600333fc477ee52fbe1f Mon Sep 17 00:00:00 2001
From b79a1e7ca1b0417b3d83c65b956f1a28e421ddc2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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..1cffc6f9a9 100644
index b8bfc757..13299ad1 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 {

8
Spigot-Server-Patches/0330-Entity-add-to-world-fixes.patch → Spigot-Server-Patches/0331-Entity-add-to-world-fixes.patch
View File

@ -1,4 +1,4 @@
From 3e9b3f4d8b6149ca9886f827178201af8944e4df Mon Sep 17 00:00:00 2001
From 389137b60458b371a3c7bc2c691c6212b85252f2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 e510940a..db8fbc00 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 a0de56c938..c4a1792911 100644
index b0053e5e..004c3ec4 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 a0de56c938..c4a1792911 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 7a9f2842..6412715b 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 {

10
Spigot-Server-Patches/0331-Fix-client-rendering-skulls-from-same-user.patch → Spigot-Server-Patches/0332-Fix-client-rendering-skulls-from-same-user.patch
View File

@ -1,4 +1,4 @@
From a70e309b53e72f03208ea7a96c2bb195a716d2ef Mon Sep 17 00:00:00 2001
From faa0e4486a3d5be538b1d82b13518c4b00d47681 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 e52014fd..da11ec16 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 d04afceb..b0e8ffc4 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 1aa36156..c5f0b853 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<PacketListenerPlayOut> {
@ -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 85fd8dab..16a5537c 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