From 4ed5ab7c792586ef022528322f09967d734f60a3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 26 Dec 2019 22:18:27 -0500 Subject: [PATCH] Update upstream CB/S --- work/CraftBukkit Submodule work/CraftBukkit 297ff400..83af86db: > SPIGOT-5457: Downgrade 'Mismatch in destroy block pos' message to debug > SPIGOT-5481: PlayerBedLeaveEvent returns wrong bed location > SPIGOT-5482: Structure Block setUsageMode encounters NullpointerException > SPIGOT-5426: isSimilar for player heads fails > SPIGOT-5478: XP not dropping when a player dies --- work/Spigot Submodule work/Spigot 05bb8bcf..492a7792: > Rebuild patches --- .../0030-Configurable-end-credits.patch | 8 ++++---- .../0040-Use-UserCache-for-player-heads.patch | 14 +++++++------- .../0093-Implement-PlayerLocaleChangeEvent.patch | 10 +++++----- ...-players-that-dismount-from-other-players.patch | 10 +++++----- .../0122-Cache-user-authenticator-threads.patch | 8 ++++---- .../0134-Properly-fix-item-duplication-bug.patch | 8 ++++---- .../0193-Add-setPlayerProfile-API-for-Skulls.patch | 8 ++++---- .../0242-InventoryCloseEvent-Reason-API.patch | 12 ++++++------ .../0293-Improve-death-events.patch | 8 ++++---- .../0317-Call-player-spectator-target-events.patch | 8 ++++---- .../0322-Reset-players-airTicks-on-respawn.patch | 8 ++++---- ...orce-entity-dismount-during-teleportation.patch | 12 ++++++------ ...-for-vehicle-tracking-issue-on-disconnect.patch | 6 +++--- .../0365-PlayerDeathEvent-getItemsToKeep.patch | 8 ++++---- ...-implement-optional-per-player-mob-spawns.patch | 6 +++--- ...ck-in-sneak-when-changing-worlds-MC-10657.patch | 8 ++++---- ...419-PlayerDeathEvent-shouldDropExperience.patch | 6 +++--- work/CraftBukkit | 2 +- work/Spigot | 2 +- 19 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch index 338b7fcef..1b3072e40 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch @@ -1,4 +1,4 @@ -From 2c065ba0b3996372f97f9b2f6e60eb09c441d409 Mon Sep 17 00:00:00 2001 +From 4463ac4edd3976bed5a7596736d4f9ea558630fa 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 f7a0a33e4..50dec5cb5 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 9e63f4412..15de985d3 100644 +index 5fe744ae8..aa509b636 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 9e63f4412..15de985d3 100644 private final RecipeBookServer recipeBook; private Vec3D co; private int cp; -@@ -689,6 +689,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -691,6 +691,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.getWorldServer().removePlayer(this); if (!this.viewingCredits) { this.viewingCredits = true; @@ -41,5 +41,5 @@ index 9e63f4412..15de985d3 100644 this.cm = true; } -- -2.24.0 +2.24.1 diff --git a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch index ea437ef08..0bb37a794 100644 --- a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch @@ -1,28 +1,28 @@ -From 55682d5222e8f536e402a641f2aa1bc7e7ba5c2e Mon Sep 17 00:00:00 2001 +From a7b457ccb383638f2d1f86e5530ad98c3d75bcbd Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 2 Mar 2016 23:42:37 -0600 Subject: [PATCH] Use UserCache for player heads diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index c83bebe709..0136e1bfe1 100644 +index a6e95a909..4fb27cc7e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -@@ -155,7 +155,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { +@@ -157,7 +157,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { if (name == null) { - profile = null; + setProfile(null); } else { -- profile = new GameProfile(null, name); +- setProfile(new GameProfile(null, name)); + // Paper start - Use Online Players Skull + GameProfile newProfile = null; + net.minecraft.server.EntityPlayer player = net.minecraft.server.MinecraftServer.getServer().getPlayerList().getPlayer(name); + if (player != null) newProfile = player.getProfile(); + if (newProfile == null) newProfile = new GameProfile(null, name); -+ profile = newProfile; ++ setProfile(newProfile); + // Paper end } return true; -- -2.21.0 +2.24.1 diff --git a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch index e63f6e5eb..76dff3b63 100644 --- a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From 8205197440b1d36daa929092848db35dd5295c71 Mon Sep 17 00:00:00 2001 +From 9c25b107e1d3984feaf5f7b81a89c3d6f5cd47a0 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 6354f25b2..6595dca86 100644 +index db89bdf90..51fb7aece 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 6354f25b2..6595dca86 100644 public PlayerConnection playerConnection; public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; -@@ -1431,13 +1431,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1433,13 +1433,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); } @@ -40,7 +40,7 @@ index 6354f25b2..6595dca86 100644 this.ci = packetplayinsettings.e(); this.getDataWatcher().set(EntityPlayer.bq, (byte) packetplayinsettings.f()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f48a77f21..534e2756d 100644 +index 09213efa1..6cf85f070 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1742,8 +1742,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -65,5 +65,5 @@ index f48a77f21..534e2756d 100644 { Set ret = new HashSet(); -- -2.24.0 +2.24.1 diff --git a/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch index ec65e0ace..68522a6e9 100644 --- a/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch @@ -1,14 +1,14 @@ -From 688be37d8d0128f2297bc067a3d06e713c2f3b6a Mon Sep 17 00:00:00 2001 +From d23347c7874ac38162497b0c0ca077d37434e29a 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 6595dca86..ab8af05e7 100644 +index 51fb7aece..764572163 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -964,6 +964,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -966,6 +966,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.playerConnection.a(this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch); } @@ -23,7 +23,7 @@ index 6595dca86..ab8af05e7 100644 } @Override -@@ -979,7 +987,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -981,7 +989,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting { if (!this.isSpectator()) { super.b(blockposition); } @@ -32,5 +32,5 @@ index 6595dca86..ab8af05e7 100644 public void a(double d0, boolean flag) { -- -2.17.1 +2.24.1 diff --git a/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch index 9baba776a..503f4e13d 100644 --- a/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch @@ -1,11 +1,11 @@ -From 0883f87742c431b54b81989cff832711eb2ef851 Mon Sep 17 00:00:00 2001 +From 566b04c264a9312b8b017f43bb074fc8840f6eb0 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2943918e4..caca40a0c 100644 +index 903c07e2f..9a4560599 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 2943918e4..caca40a0c 100644 this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint)); } -@@ -1298,7 +1307,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1300,7 +1309,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 2943918e4..caca40a0c 100644 this.cr = entityplayer.cr; this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft()); -- -2.17.1 +2.24.1 diff --git a/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch index fe5ec0c45..1bff7c589 100644 --- a/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 3ba999f1582d8a1669193f86691db5856546b48d Mon Sep 17 00:00:00 2001 +From dafb32db7aafc0f8a2ac1501aebd2462e72dc9c1 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 1c0bf4dacb..774289a0f0 100644 +index 9a4560599..39d10f870 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1766,7 +1766,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1768,7 +1768,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override protected boolean isFrozen() { @@ -19,7 +19,7 @@ index 1c0bf4dacb..774289a0f0 100644 @Override diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 16b70221ea..cc6a2aaeb3 100644 +index 16b70221e..cc6a2aaeb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2525,7 +2525,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch index aec5ac7ed..4add3ae30 100644 --- a/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From ed3bb3a215f95fd2c7df8b6899e6562ed30e874c Mon Sep 17 00:00:00 2001 +From 9027adb44adb78dd5a0b21f7a154b8c3e2063517 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:36:25 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls @@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo which commonly cause rate limit issues with Mojang API diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java -index a4bc7f9701..2dd2f476f0 100644 +index a4bc7f970..2dd2f476f 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java @@ -1,5 +1,7 @@ @@ -48,7 +48,7 @@ index a4bc7f9701..2dd2f476f0 100644 public BlockFace getRotation() { BlockData blockData = getBlockData(); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index a83abc722d..c29a78fd3c 100644 +index 4fb27cc7e..18545e5ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -3,6 +3,8 @@ package org.bukkit.craftbukkit.inventory; @@ -68,7 +68,7 @@ index a83abc722d..c29a78fd3c 100644 @DelegateDeserialization(SerializableMeta.class) class CraftMetaSkull extends CraftMetaItem implements SkullMeta { -@@ -131,6 +134,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { +@@ -133,6 +136,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { return hasOwner() ? profile.getName() : null; } diff --git a/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch index b50c250d7..60177ef8b 100644 --- a/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From a87a35119354a4e30385988d81eca2597fa14df7 Mon Sep 17 00:00:00 2001 +From eb8e56f6ab1d36c34da3b2c08bef1c5c911a5729 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ 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/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 676349ca8..9cce323da 100644 +index ba3e6b882..2265b01e6 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -34,7 +34,7 @@ index 676349ca8..9cce323da 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 774289a0f..1e552b1a1 100644 +index 39d10f870..ee2810685 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -55,7 +55,7 @@ index 774289a0f..1e552b1a1 100644 } String deathMessage = event.getDeathMessage(); -@@ -1026,7 +1026,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1028,7 +1028,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return OptionalInt.empty(); } else { if (this.activeContainer != this.defaultContainer) { @@ -64,7 +64,7 @@ index 774289a0f..1e552b1a1 100644 } this.nextContainerCounter(); -@@ -1086,7 +1086,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1088,7 +1088,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } // CraftBukkit end if (this.activeContainer != this.defaultContainer) { @@ -73,7 +73,7 @@ index 774289a0f..1e552b1a1 100644 } // this.nextContainerCounter(); // CraftBukkit - moved up -@@ -1150,7 +1150,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1152,7 +1152,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void closeInventory() { diff --git a/Spigot-Server-Patches/0293-Improve-death-events.patch b/Spigot-Server-Patches/0293-Improve-death-events.patch index d9962f3db..350169f42 100644 --- a/Spigot-Server-Patches/0293-Improve-death-events.patch +++ b/Spigot-Server-Patches/0293-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 761cae72d07c79acbedd36b65ae253d6fc965e54 Mon Sep 17 00:00:00 2001 +From 57a606b8230e18c57658ee3b76e82ec550a63387 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events @@ -61,7 +61,7 @@ index b51662ee9..e6032e3ed 100644 } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index ac9a5e113..45b4db990 100644 +index 97ffd9346..bd62ac3ed 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -571,15 +571,25 @@ public class EntityFox extends EntityAnimal { @@ -279,7 +279,7 @@ index 1592a705f..b59b39d41 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 1e552b1a1..4c7692721 100644 +index ee2810685..9068aeeec 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 { @@ -309,7 +309,7 @@ index 1e552b1a1..4c7692721 100644 // SPIGOT-943 - only call if they have an inventory open if (this.activeContainer != this.defaultContainer) { -@@ -669,8 +682,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -671,8 +684,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } } } diff --git a/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch index e49abf577..5f4f496af 100644 --- a/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch @@ -1,11 +1,11 @@ -From 42375f7bc96fefb507c63cdd141bce77be6b3226 Mon Sep 17 00:00:00 2001 +From 3d80d3927d34c8448d1cafafd86ca2896c07e345 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 4c76927217..d32d6d40ad 100644 +index 9068aeeec..6a1ceaf69 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 4c76927217..d32d6d40ad 100644 public boolean worldChangeInvuln; private boolean cm; private void setHasSeenCredits(boolean has) { this.cm = has; } // Paper - OBFHELPER private final RecipeBookServer recipeBook; -@@ -1555,15 +1555,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1557,15 +1557,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity); } @@ -58,7 +58,7 @@ index 4c76927217..d32d6d40ad 100644 } @Override -@@ -1571,7 +1591,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1573,7 +1593,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting { if (this.portalCooldown > 0 && !this.worldChangeInvuln) { --this.portalCooldown; } diff --git a/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch index 7cbb6eaac..1c99755e9 100644 --- a/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch @@ -1,11 +1,11 @@ -From a41776a605355949df30008014d529646343675c Mon Sep 17 00:00:00 2001 +From a621710ac30b03e36c7db4cd4f49f6af330fbc11 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 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5d31068d7d..365984bb8b 100644 +index 5d31068d7..365984bb8 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2326,6 +2326,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,10 +17,10 @@ index 5d31068d7d..365984bb8b 100644 return 300; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d32d6d40ad..c90ae53a65 100644 +index 6a1ceaf69..fe3cb5373 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1831,6 +1831,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1833,6 +1833,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } this.setHealth(this.getMaxHealth()); diff --git a/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch index 007765dc6..adf475858 100644 --- a/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From 5968833c58c2c2479dbc25f2cb1177fc0a8b4d85 Mon Sep 17 00:00:00 2001 +From ba2c6651b71525ab731cdcd58df467f389bc42d8 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 @@ -20,7 +20,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 365984bb8b..0f24805210 100644 +index 365984bb8..0f2480521 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2027,12 +2027,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -72,7 +72,7 @@ index 365984bb8b..0f24805210 100644 if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 78e48f478c..4bb24de9d9 100644 +index 763ca58d1..003df00b4 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -968,9 +968,11 @@ public abstract class EntityHuman extends EntityLiving { @@ -91,7 +91,7 @@ index 78e48f478c..4bb24de9d9 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b59b39d418..a63edeeb95 100644 +index b59b39d41..a63edeeb9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2733,11 +2733,13 @@ public abstract class EntityLiving extends Entity { @@ -112,10 +112,10 @@ index b59b39d418..a63edeeb95 100644 this.a(entity); } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index c90ae53a65..c5cbbe1a25 100644 +index fe3cb5373..784e472fb 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -985,11 +985,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -987,11 +987,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } } diff --git a/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index 6cdb6f890..848137c26 100644 --- a/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,14 +1,14 @@ -From 73955b76dd5133d111ca1f1b316345d439f32bb3 Mon Sep 17 00:00:00 2001 +From 4237f96053ab8546efd78d5d069864ab8c18f2b1 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 ae100a374f..ed1c37bee9 100644 +index 8276010a5..ebab423af 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1260,6 +1260,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1262,6 +1262,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void n() { this.cq = true; this.ejectPassengers(); diff --git a/Spigot-Server-Patches/0365-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0365-PlayerDeathEvent-getItemsToKeep.patch index c4c0ef2dc..ad4dbdb07 100644 --- a/Spigot-Server-Patches/0365-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-Server-Patches/0365-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From f71d7b6bd67be1d934922cf2cefd285c57433423 Mon Sep 17 00:00:00 2001 +From 703338d91dab4713748013b1d82321a45bb86647 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 ed1c37bee9..ba30730b5a 100644 +index ebab423af..f482bb6cb 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -510,6 +510,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -58,8 +58,8 @@ index ed1c37bee9..ba30730b5a 100644 @Override public void die(DamageSource damagesource) { boolean flag = this.world.getGameRules().getBoolean(GameRules.SHOW_DEATH_MESSAGES); -@@ -594,7 +634,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { - this.releaseShoulderEntities(); +@@ -596,7 +636,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { + this.dropExperience(); // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory. if (!event.getKeepInventory()) { - this.inventory.clear(); diff --git a/Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch index bc249bb93..c70ed51a7 100644 --- a/Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch +++ b/Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch @@ -1,4 +1,4 @@ -From 56fbbd1827c4153ca6cd35339da70d7d7c17906b Mon Sep 17 00:00:00 2001 +From f82cd75f007f9d831b66f2ef501e942f3cf194f5 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 19 Aug 2019 01:27:58 +0500 Subject: [PATCH] implement optional per player mob spawns @@ -599,7 +599,7 @@ index 58654f453..8a35e2994 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index ba30730b5..7fbd39042 100644 +index f482bb6cb..98a1c633f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -80,6 +80,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -622,7 +622,7 @@ index ba30730b5..7fbd39042 100644 } // Yes, this doesn't match Vanilla, but it's the best we can do for now. -@@ -1735,6 +1741,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1737,6 +1743,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } diff --git a/Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index d09bd0c26..52b9ebf46 100644 --- a/Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -1,14 +1,14 @@ -From 9fa26888edb34f403a928423f97954b0733ce328 Mon Sep 17 00:00:00 2001 +From 380f0e8a3892f3ceeea32a0a86d48e466f156366 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 9 Oct 2019 21:51:43 -0500 Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 7fbd390426..f130c5ddc4 100644 +index 98a1c633f..b2d53c57d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -946,6 +946,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -948,6 +948,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.lastHealthSent = -1.0F; this.lastFoodSent = -1; @@ -18,7 +18,7 @@ index 7fbd390426..f130c5ddc4 100644 PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld()); this.world.getServer().getPluginManager().callEvent(changeEvent); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index f702619aa2..7b79ee4fe5 100644 +index f702619aa..7b79ee4fe 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -729,6 +729,8 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0419-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0419-PlayerDeathEvent-shouldDropExperience.patch index 56b0d7d99..078923e91 100644 --- a/Spigot-Server-Patches/0419-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-Server-Patches/0419-PlayerDeathEvent-shouldDropExperience.patch @@ -1,14 +1,14 @@ -From 01886a4ffa8057b331659dd2a18eb57faa05aa98 Mon Sep 17 00:00:00 2001 +From 7bf33f402e0d3e1fd6adb9e95394ff4243df91e9 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 24 Dec 2019 00:35:42 +0000 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index ed6f1b1a3..5cd709991 100644 +index f28de40a7..0888f268f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -649,6 +649,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -651,6 +651,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } this.setSpectatorTarget(this); // Remove spectated target diff --git a/work/CraftBukkit b/work/CraftBukkit index 297ff4000..83af86dba 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 297ff4000eebf32a2ad236374c6525b204f04045 +Subproject commit 83af86dba51125169c919847413a05cf5f9d656b diff --git a/work/Spigot b/work/Spigot index 05bb8bcfe..492a77921 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 05bb8bcfea17355cab4b4986524329c51ed5f5fc +Subproject commit 492a779218933f1887f97c7fccf24e54b1d18e4e