diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch index 2481d6dba5..f328b30993 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch @@ -1,4 +1,4 @@ -From 5564e230d907e9a05618e91a9eece6afe1bbf5be Mon Sep 17 00:00:00 2001 +From 08f004e8c862bfb241bd86d5b5877b6416cd3eda Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits @@ -20,7 +20,7 @@ index a797a57671..c2b9690a0c 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index e4d1daa431..1dba939967 100644 +index f7cf02f588..e60ead5ecb 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -32,7 +32,7 @@ index e4d1daa431..1dba939967 100644 private final RecipeBookServer recipeBook; private Vec3D cr; private int cs; -@@ -698,6 +698,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -704,6 +704,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.getWorldServer().removePlayer(this); if (!this.viewingCredits) { this.viewingCredits = true; @@ -41,5 +41,5 @@ index e4d1daa431..1dba939967 100644 this.cp = true; } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch index c2f1b0bfa1..c2b7137eef 100644 --- a/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From c4020add3e3875ede564e446bc6cc8b3f5aa2d36 Mon Sep 17 00:00:00 2001 +From d6261ae0b5190c624e74af4283658c118657d816 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 4603165280..0cd9f83cc9 100644 +index 73af650c0c..ee5f2f0afa 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand; @@ -17,7 +17,7 @@ index 4603165280..0cd9f83cc9 100644 public PlayerConnection playerConnection; public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; -@@ -1441,13 +1441,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1447,13 +1447,20 @@ 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); } @@ -66,5 +66,5 @@ index cc31b8d4ac..397349963d 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch index 9c1b881056..77520345c7 100644 --- a/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch @@ -1,14 +1,14 @@ -From 62aceeabe5074fb418f1cc663e3174ceeaaf71b5 Mon Sep 17 00:00:00 2001 +From 919059f2d0e417cb86a796468ab611442c587181 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Jul 2016 16:33:03 -0500 Subject: [PATCH] Re-track players that dismount from other players diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0cd9f83cc9..5db5e15ac8 100644 +index ee5f2f0afa..55ec0bb14e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -972,6 +972,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -978,6 +978,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { if (entity1 != entity && this.playerConnection != null) { this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch); } @@ -24,5 +24,5 @@ index 0cd9f83cc9..5db5e15ac8 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch index 91d5a27396..70e247b129 100644 --- a/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From db54244a1561469593ace7d57a037234c15bc43f Mon Sep 17 00:00:00 2001 +From 0a6ae4866a84d4a1c9a948775e8adfd1736fcf6b Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent @@ -39,10 +39,10 @@ index 1400b3f44b..4119709cb8 100644 entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null); entitywitch.setNoAI(this.isNoAI()); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 1a9e5b4b34..a26ecc86f6 100644 +index bb5c5aa3d6..cf1abd1875 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1010,6 +1010,14 @@ public class CraftEventFactory { +@@ -1014,6 +1014,14 @@ public class CraftEventFactory { return event; } @@ -58,5 +58,5 @@ index 1a9e5b4b34..a26ecc86f6 100644 HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power); horse.getBukkitEntity().getServer().getPluginManager().callEvent(event); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0128-Optimise-removeQueue.patch b/Spigot-Server-Patches/0128-Optimise-removeQueue.patch index cf5ec74cd5..3f61e78bbd 100644 --- a/Spigot-Server-Patches/0128-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0128-Optimise-removeQueue.patch @@ -1,11 +1,11 @@ -From ec410af872bd0cd42772cca76f08fdb17d20289c Mon Sep 17 00:00:00 2001 +From 612c295c15b346d0b04a58b456f10b21a19353f6 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 a7bf433a7f..be1f4f38ac 100644 +index 0e0faef89e..8254b8d68d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -4,7 +4,9 @@ import com.google.common.collect.Lists; @@ -50,7 +50,7 @@ index a7bf433a7f..be1f4f38ac 100644 this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint)); } -@@ -1315,7 +1324,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1321,7 +1330,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.lastHealthSent = -1.0F; this.lastFoodSent = -1; // this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit @@ -67,5 +67,5 @@ index a7bf433a7f..be1f4f38ac 100644 this.cu = entityplayer.cu; this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft()); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch index be3b213ef6..3b3bbfd506 100644 --- a/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 16f86a9895e1ccad4dc3fa89323e535b363748e5 Mon Sep 17 00:00:00 2001 +From 303e19d604d675467fcfdc323aa5e5512833511b Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -92,10 +92,10 @@ index d1710259ce..5f0cb4c33d 100644 this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition()); } else { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e597f37903..224d1dbffc 100644 +index 445f2aef95..a33a9fd792 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1114,6 +1114,16 @@ public class CraftEventFactory { +@@ -1118,6 +1118,16 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } @@ -113,5 +113,5 @@ index e597f37903..224d1dbffc 100644 Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch index 994b7b1b29..9e17d08b29 100644 --- a/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From f04c25e795808c5b0d847cf25d7c2eb473341417 Mon Sep 17 00:00:00 2001 +From b4a1a1e7a6699bbd267a11f664b485f24d251b28 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 be1f4f38ac..e16b30c6c0 100644 +index 8254b8d68d..14ea4641dc 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1788,7 +1788,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1794,7 +1794,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override protected boolean isFrozen() { @@ -32,5 +32,5 @@ index d2c178429d..f88ec07835 100644 // CraftBukkit end -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index a11a614d00..93b977311c 100644 --- a/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From bbce7176033db62b4eaeedb83fdc67644c8ca6ac Mon Sep 17 00:00:00 2001 +From c9f38b6192671a5eca7f0220f100ed9dc534ada7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -265,10 +265,10 @@ index d68826aa7b..0f6cd246ae 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6f8c2a1d2b..9c68334377 100644 +index cd93ad3e05..9f449d1d3b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1608,7 +1608,7 @@ public class CraftWorld implements World { +@@ -1610,7 +1610,7 @@ public class CraftWorld implements World { } else if (TNTPrimed.class.isAssignableFrom(clazz)) { entity = new EntityTNTPrimed(world, x, y, z, null); } else if (ExperienceOrb.class.isAssignableFrom(clazz)) { @@ -301,5 +301,5 @@ index 1b512cc45c..fbad045675 100644 public EntityExperienceOrb getHandle() { return (EntityExperienceOrb) entity; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch index 2690b3edb1..f3f27a2654 100644 --- a/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From c99f8c465446df9d73dc8221a776e41e9da77f86 Mon Sep 17 00:00:00 2001 +From bfe328d4c5d86a9718b359e5b277e8790bb18f87 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 15 Aug 2017 22:29:12 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -43,10 +43,10 @@ index ebd1ff1d50..5172ff53d3 100644 if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 9c68334377..84f2a966c5 100644 +index 9f449d1d3b..1323358b2e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2037,11 +2037,17 @@ public class CraftWorld implements World { +@@ -2039,11 +2039,17 @@ public class CraftWorld implements World { @Override public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { @@ -66,5 +66,5 @@ index 9c68334377..84f2a966c5 100644 x, y, z, // Position count, // Count -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch index f9b65d9e2c..199c50b98f 100644 --- a/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch +++ b/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch @@ -1,4 +1,4 @@ -From 11863a26e90e9401cc235e0a89bf03db224c978c Mon Sep 17 00:00:00 2001 +From 163fbf0ca0b8ea71f9b674bd0e63ae76e88f12b9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Jun 2018 20:39:20 -0400 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity @@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function Item can be set inside of the Consumer pre spawn function. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 84f2a966c5..11ab222c54 100644 +index 1323358b2e..11d64203f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1304,6 +1304,10 @@ public class CraftWorld implements World { +@@ -1306,6 +1306,10 @@ public class CraftWorld implements World { if (Boat.class.isAssignableFrom(clazz)) { entity = new EntityBoat(world, x, y, z); entity.setPositionRotation(x, y, z, yaw, pitch); @@ -23,5 +23,5 @@ index 84f2a966c5..11ab222c54 100644 entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z))); } else if (Projectile.class.isAssignableFrom(clazz)) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch index 479156328d..8129cf5d11 100644 --- a/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch +++ b/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch @@ -1,14 +1,14 @@ -From 3a462d6f3a297b26ed83436cc8fae2dc439dc0e5 Mon Sep 17 00:00:00 2001 +From 321b3eec743de39fea928a5d2293156fa470731d Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:08:14 +0200 Subject: [PATCH] Implement World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 10c91699c1..09e6abdae2 100644 +index 4153dfe488..eef3b46e40 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1107,6 +1107,15 @@ public class CraftWorld implements World { +@@ -1109,6 +1109,15 @@ public class CraftWorld implements World { return list; } @@ -25,5 +25,5 @@ index 10c91699c1..09e6abdae2 100644 public void save() { this.server.checkSaveState(); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch index 4b0587b8e0..c0a5d197df 100644 --- a/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 9dd4d26a449e3507adb87e10c3fa8736eb147e79 Mon Sep 17 00:00:00 2001 +From 0e039ed6ae2fe9550d288e94427b129bb48d12bb Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -34,7 +34,7 @@ index fc25b3c749..e316e2af7d 100644 this.activeContainer = this.defaultContainer; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index e16b30c6c0..17255a650f 100644 +index 14ea4641dc..7519827a88 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -360,7 +360,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -46,7 +46,7 @@ index e16b30c6c0..17255a650f 100644 this.activeContainer = this.defaultContainer; } -@@ -528,7 +528,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -534,7 +534,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { // SPIGOT-943 - only call if they have an inventory open if (this.activeContainer != this.defaultContainer) { @@ -55,7 +55,7 @@ index e16b30c6c0..17255a650f 100644 } String deathMessage = event.getDeathMessage(); -@@ -1050,7 +1050,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1056,7 +1056,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return OptionalInt.empty(); } else { if (this.activeContainer != this.defaultContainer) { @@ -64,7 +64,7 @@ index e16b30c6c0..17255a650f 100644 } this.nextContainerCounter(); -@@ -1103,7 +1103,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1109,7 +1109,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } // CraftBukkit end if (this.activeContainer != this.defaultContainer) { @@ -73,7 +73,7 @@ index e16b30c6c0..17255a650f 100644 } // this.nextContainerCounter(); // CraftBukkit - moved up -@@ -1167,7 +1167,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1173,7 +1173,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void closeInventory() { @@ -168,10 +168,10 @@ index b49c3029fc..a22bb25ff7 100644 // Check if the fromWorld and toWorld are the same. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 47338c692a..309cbd0dc6 100644 +index 9de01e6041..80b0fb8c11 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1255,8 +1255,19 @@ public class CraftEventFactory { +@@ -1259,8 +1259,19 @@ public class CraftEventFactory { return event; } @@ -193,5 +193,5 @@ index 47338c692a..309cbd0dc6 100644 human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity()); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch index 88b548219b..d89e2c09ab 100644 --- a/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From f2b1eae290b09ed2df91f723cc70c581adf93a44 Mon Sep 17 00:00:00 2001 +From e723c0ee1bfff0b62d6996d7f9dbcf608abcf629 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 14:22:26 +0200 Subject: [PATCH] Vanished players don't have rights @@ -72,10 +72,10 @@ index 59b1e6ce2e..b90cc6652b 100644 BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 309cbd0dc6..78baaf6253 100644 +index 80b0fb8c11..dd25a8ad29 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1136,6 +1136,14 @@ public class CraftEventFactory { +@@ -1140,6 +1140,14 @@ public class CraftEventFactory { Projectile projectile = (Projectile) entity.getBukkitEntity(); org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity(); com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided); @@ -91,5 +91,5 @@ index 309cbd0dc6..78baaf6253 100644 return event; } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch index f6a5000a0b..9286e8b318 100644 --- a/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,4 +1,4 @@ -From ea4fde4b197385c4546c85d986442241cc0ebf10 Mon Sep 17 00:00:00 2001 +From 9d589cfdd87815a358293591fc32e3f2db7fb0e9 Mon Sep 17 00:00:00 2001 From: Mystiflow Date: Fri, 6 Jul 2018 13:21:30 +0100 Subject: [PATCH] Send nearby packets from world player list not server list @@ -68,10 +68,10 @@ index 168e19b206..d11d01d739 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 73e0e47a61..8499bad15b 100644 +index 0f4d55ad01..668bec0869 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1909,7 +1909,7 @@ public class CraftWorld implements World { +@@ -1911,7 +1911,7 @@ public class CraftWorld implements World { double z = loc.getZ(); PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch); @@ -81,5 +81,5 @@ index 73e0e47a61..8499bad15b 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0303-Improve-death-events.patch b/Spigot-Server-Patches/0303-Improve-death-events.patch index f9bec6fcab..8f1b125a4a 100644 --- a/Spigot-Server-Patches/0303-Improve-death-events.patch +++ b/Spigot-Server-Patches/0303-Improve-death-events.patch @@ -1,4 +1,4 @@ -From b6ed2af7117feb5b10c3ce830596600f017ae524 Mon Sep 17 00:00:00 2001 +From 8586cf5d11612c96160a4e2886412ee2f45da753 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events @@ -249,7 +249,7 @@ index 19e7114cbb..c357339c26 100644 return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 17255a650f..5610f989ee 100644 +index 7519827a88..a0f27f1bcb 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -263,7 +263,7 @@ index 17255a650f..5610f989ee 100644 // CraftBukkit start public String displayName; -@@ -525,6 +529,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -531,6 +535,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { String deathmessage = defaultMessage.getString(); org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory); @@ -279,7 +279,7 @@ index 17255a650f..5610f989ee 100644 // SPIGOT-943 - only call if they have an inventory open if (this.activeContainer != this.defaultContainer) { -@@ -678,8 +691,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -684,8 +697,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } } } @@ -348,7 +348,7 @@ index 7e2d4f4527..bd87a1cf2c 100644 public void injectScaledMaxHealth(Collection collection, boolean force) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index eec3effef7..0d66765591 100644 +index c9185a1986..71b48d4180 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -736,9 +736,16 @@ public class CraftEventFactory { @@ -417,5 +417,5 @@ index eec3effef7..0d66765591 100644 * Server methods */ -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch index 66106a91cc..1afdb2d9b4 100644 --- a/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch @@ -1,11 +1,11 @@ -From 2f5c5433de28e9be5d2e4f88b5b39c9e7e71ca94 Mon Sep 17 00:00:00 2001 +From df37016c278c1503a09326889f4e1c1ba3f27004 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:32:19 -0500 Subject: [PATCH] Call player spectator target events diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5610f989ee..5553073f93 100644 +index a0f27f1bcb..314ff6aadb 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -17,7 +17,7 @@ index 5610f989ee..5553073f93 100644 public boolean worldChangeInvuln; private boolean cp; private void setHasSeenCredits(boolean has) { this.cp = has; } // Paper - OBFHELPER private final RecipeBookServer recipeBook; -@@ -1566,15 +1566,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1572,15 +1572,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity); } @@ -59,5 +59,5 @@ index 5610f989ee..5553073f93 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch index 2bf63c6d49..923e064f70 100644 --- a/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch @@ -1,4 +1,4 @@ -From da37da457928131ba70127709183dfa69f743bea Mon Sep 17 00:00:00 2001 +From 2f2dbc48eecd5b2119a5a819dcb143a3383a8ffe Mon Sep 17 00:00:00 2001 From: GreenMeanie Date: Sat, 20 Oct 2018 22:34:02 -0400 Subject: [PATCH] Reset players airTicks on respawn @@ -18,10 +18,10 @@ index a6e5ac070c..85106e601c 100644 } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5553073f93..03a755e782 100644 +index 314ff6aadb..e8bc1634ef 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1854,6 +1854,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1860,6 +1860,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } this.setHealth(this.getMaxHealth()); @@ -30,5 +30,5 @@ index 5553073f93..03a755e782 100644 this.fallDistance = 0; this.foodData = new FoodMetaData(this); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch index d8c824d4bd..af82b278ef 100644 --- a/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From 8589bec47b724801ef96d006fe4a276a5785e028 Mon Sep 17 00:00:00 2001 +From 66a76ef30f11e0d87fe4190a40a55eb61266015d Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 15 Nov 2018 13:38:37 +0000 Subject: [PATCH] force entity dismount during teleportation @@ -112,10 +112,10 @@ index c357339c26..2806808328 100644 this.B(entity); } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 03a755e782..ee77ad79db 100644 +index e8bc1634ef..e4b121c218 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -994,11 +994,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1000,11 +1000,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } } @@ -133,5 +133,5 @@ index 03a755e782..ee77ad79db 100644 if (entity1 != entity && this.playerConnection != null) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index ca3769d8aa..b3a403d6bb 100644 --- a/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,14 +1,14 @@ -From 044497d470877497da889d31d71a8a8c80b9f3ed Mon Sep 17 00:00:00 2001 +From 04d4e3a892ffbf7855ac3ffe7206acf2bf47044b Mon Sep 17 00:00:00 2001 From: connorhartley Date: Mon, 7 Jan 2019 14:43:48 -0600 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 60cc81ef77..cce0c30fa3 100644 +index 3d0400d828..06ca6cbf05 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1277,6 +1277,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1283,6 +1283,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void n() { this.ct = true; this.ejectPassengers(); @@ -23,5 +23,5 @@ index 60cc81ef77..cce0c30fa3 100644 this.wakeup(true, false, false); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch index 62c6b93f8d..ba48b4557d 100644 --- a/Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From c8a7d01bce491fd01970a8251e5ac6b4808d6b5e Mon Sep 17 00:00:00 2001 +From b29be2319b503cdc01fe8380e2dc5d322962cd60 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 23:01:33 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index cce0c30fa3..ed37f45f1c 100644 +index 06ca6cbf05..d273546676 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -508,6 +508,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -58,7 +58,7 @@ index cce0c30fa3..ed37f45f1c 100644 @Override public void die(DamageSource damagesource) { boolean flag = this.world.getGameRules().getBoolean("showDeathMessages"); -@@ -586,7 +626,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -592,7 +632,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.releaseShoulderEntities(); // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory. if (!event.getKeepInventory()) { @@ -73,5 +73,5 @@ index cce0c30fa3..ed37f45f1c 100644 this.setSpectatorTarget(this); // Remove spectated target -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch b/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch index 9959479a25..47789877de 100644 --- a/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch +++ b/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch @@ -1,4 +1,4 @@ -From af9f9c29a1273780f01d748233d3f82c46fa76e2 Mon Sep 17 00:00:00 2001 +From 4bc01cc639689dcd46c522f4b0147352c867c7b5 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 May 2019 12:29:24 -0700 Subject: [PATCH] Async Chunk placeholder @@ -6,7 +6,7 @@ Subject: [PATCH] Async Chunk placeholder Until we figure out Mojang's ticket system. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index fa4142c824..0328eadf27 100644 +index 5531000a83..6532ffe8a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -14,6 +14,7 @@ import java.util.Objects; @@ -17,7 +17,7 @@ index fa4142c824..0328eadf27 100644 import java.util.function.Predicate; import net.minecraft.server.AxisAlignedBB; import net.minecraft.server.BiomeBase; -@@ -2117,6 +2118,40 @@ public class CraftWorld implements World { +@@ -2119,6 +2120,40 @@ public class CraftWorld implements World { return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.getZ()); } @@ -59,5 +59,5 @@ index fa4142c824..0328eadf27 100644 private final Spigot spigot = new Spigot() { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 58681cb995..b9ac69efa7 100644 --- a/Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From c8bfbe6ace15838a1856624bdf4cf6c4ec0ae007 Mon Sep 17 00:00:00 2001 +From cbae2eadd07209fe62d1a50bc49d49bb49ec58cb 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 @@ -196,10 +196,10 @@ index e9e5ecf747..40b3d96edd 100644 public LongSet getForceLoadedChunks() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d467631590..3f72583e26 100644 +index fce43f61f4..e0d89cc533 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1748,15 +1748,21 @@ public class CraftWorld implements World { +@@ -1750,15 +1750,21 @@ public class CraftWorld implements World { @Override public void setKeepSpawnInMemory(boolean keepLoaded) { @@ -226,5 +226,5 @@ index d467631590..3f72583e26 100644 @Override -- -2.21.0 +2.22.0 diff --git a/work/Bukkit b/work/Bukkit index 45690fe9a8..04405534f2 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 45690fe9a8644b71de33137f88e7c5422567c0c8 +Subproject commit 04405534f2a29122608507b713f9de1f38ebc46a diff --git a/work/CraftBukkit b/work/CraftBukkit index 4090d01f6d..f2757f95b3 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 4090d01f6ddccafb2e609420139bbd53f1f48c60 +Subproject commit f2757f95b3089d9beb17b5effe72ea183a18b224