From bd0337b7a9e134c6da5a35e84c732a2feff30d11 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 13 Jan 2020 22:12:54 +0000 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 7dd1cfcd PortalEvent additions CraftBukkit Changes: e8cb2f51 SPIGOT-5252: Nether portal fixes and additions fde78ef3 SPIGOT-5477: Server not shutting down Spigot Changes: 037559e7 Rebuild patches --- ...dd-configurable-portal-search-radius.patch | 40 ++++++++++++++----- ...93-Implement-PlayerLocaleChangeEvent.patch | 8 ++-- ...3-Optional-TNT-doesn-t-move-in-water.patch | 8 ++-- ...ers-that-dismount-from-other-players.patch | 12 +++--- ...122-Cache-user-authenticator-threads.patch | 6 +-- ...34-Properly-fix-item-duplication-bug.patch | 6 +-- .../0242-InventoryCloseEvent-Reason-API.patch | 24 +++++------ ...-Call-player-spectator-target-events.patch | 8 ++-- ...22-Reset-players-airTicks-on-respawn.patch | 8 ++-- ...entity-dismount-during-teleportation.patch | 8 ++-- ...vehicle-tracking-issue-on-disconnect.patch | 6 +-- .../0374-Duplicate-UUID-Resolve-Option.patch | 6 +-- ...ement-optional-per-player-mob-spawns.patch | 8 ++-- ...-sneak-when-changing-worlds-MC-10657.patch | 6 +-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 17 files changed, 89 insertions(+), 71 deletions(-) diff --git a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch index 79fcbc552e..d6ba0990f4 100644 --- a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch @@ -1,4 +1,4 @@ -From e0d4cb66f977db1a360ec9c70b9d5147e587f7c9 Mon Sep 17 00:00:00 2001 +From 12feca284a4a8426cad2ba6fb721e7090cd5f875 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:46:17 -0600 Subject: [PATCH] Add configurable portal search radius @@ -18,23 +18,41 @@ index 62e793b71..5de4ec052 100644 + portalSearchRadius = getInt("portal-search-radius", 128); + } } +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index 2ed5ff412..909f446c6 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -2533,7 +2533,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke + + // CraftBukkit start - EntityPortalEvent + // SPIGOT-5136 - don't fire event for CraftEntity.teleport +- int searchRadius = 128; ++ int searchRadius = world.paperConfig.portalSearchRadius; // Paper - use portal search radius as default + if (location == null) { + Location enter = this.getBukkitEntity().getLocation(); + Location exit = new Location(worldserver1.getWorld(), blockposition.getX(), blockposition.getY(), blockposition.getZ()); diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index 192ddb90a..25b694e7d 100644 +index 503e3016a..b5f224e3b 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java -@@ -39,10 +39,10 @@ public class PortalTravelAgent { - public ShapeDetector.Shape a(BlockPosition blockposition, Vec3D vec3d, EnumDirection enumdirection, double d0, double d1, boolean flag) { +@@ -45,7 +45,7 @@ public class PortalTravelAgent { + @Nullable + public ShapeDetector.Shape a(BlockPosition blockposition, Vec3D vec3d, EnumDirection enumdirection, double d0, double d1, boolean flag) { // PAIL: rename to findPortal, d0 = portal offset x, d1 = portal offset z, flag = instanceof EntityHuman + // CraftBukkit start +- return findPortal(blockposition, vec3d, enumdirection, d0, d1, flag, 128); ++ return findPortal(blockposition, vec3d, enumdirection, d0, d1, flag, world.paperConfig.portalSearchRadius); // Paper + } + + @Nullable +@@ -53,7 +53,7 @@ public class PortalTravelAgent { + // CraftBukkit end VillagePlace villageplace = this.world.B(); - villageplace.a(this.world, blockposition, 128); -+ villageplace.a(this.world, blockposition, world.paperConfig.portalSearchRadius); // Paper - TODO: VALIDATE ++ villageplace.a(this.world, blockposition, searchRadius); // Paper - This impacts the # of chunks searched for entries List list = (List) villageplace.b((villageplacetype) -> { return villageplacetype == VillagePlaceType.u; -- }, blockposition, 128, VillagePlace.Occupancy.ANY).collect(Collectors.toList()); -+ }, blockposition, world.paperConfig.portalSearchRadius, VillagePlace.Occupancy.ANY).collect(Collectors.toList()); // Paper - TODO: VALIDATE - Optional optional = list.stream().min(Comparator.comparingDouble((villageplacerecord) -> { // CraftBukkit - decompile error - return villageplacerecord.f().m(blockposition); - }).thenComparingInt((villageplacerecord) -> { + }, blockposition, searchRadius, VillagePlace.Occupancy.ANY).collect(Collectors.toList()); // CraftBukkit - searchRadius -- -2.24.0 +2.24.1 diff --git a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch index 646145b1c3..e6052c6a28 100644 --- a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From 2646229263480c46475d417cebec9228690dfe5a Mon Sep 17 00:00:00 2001 +From 013d3a8f08c00a46fea6ded0b2ccaa883310111f 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 db89bdf90f..51fb7aeced 100644 +index ab2d8015a..12fa705b0 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 db89bdf90f..51fb7aeced 100644 public PlayerConnection playerConnection; public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; -@@ -1433,13 +1433,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1459,13 +1459,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 db89bdf90f..51fb7aeced 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 74a0ceba64..fe26ce3af8 100644 +index 74a0ceba6..fe26ce3af 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1747,8 +1747,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch index f05f5eedaf..758d690fd0 100644 --- a/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch +++ b/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch @@ -1,4 +1,4 @@ -From 1eafa5490facbe5bf35b93d62c88f1fd38e0939a Mon Sep 17 00:00:00 2001 +From 8129212021aaf361247e997c0b9ad659beb9f485 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional TNT doesn't move in water @@ -32,10 +32,10 @@ index 277f7618e..1dbeb209e 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2e56c7f57..e04b3f4e2 100644 +index 68e3c7dad..5ccdb389a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2705,6 +2705,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2710,6 +2710,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } public boolean bM() { @@ -107,5 +107,5 @@ index a13fd9b34..3ff7a7b4a 100644 private java.util.Map trackedPlayerMap = null; -- -2.17.1 +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 68522a6e90..9a014c5f6d 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,17 +1,17 @@ -From d23347c7874ac38162497b0c0ca077d37434e29a Mon Sep 17 00:00:00 2001 +From 5a1ada2f1061cb0b8cc21617685f1962b8cb1882 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 51fb7aece..764572163 100644 +index 12fa705b0..5d6acca27 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -966,6 +966,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -991,6 +991,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); } - + // Paper start - "Fixes" an issue in which the vehicle player would not be notified that the passenger dismounted + if (entity instanceof EntityPlayer) { + // TODO verify this solution @@ -20,10 +20,10 @@ index 51fb7aece..764572163 100644 + worldServer.getChunkProvider().playerChunkMap.addEntity(this); + } + // Paper end + } - @Override -@@ -981,7 +989,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1007,7 +1015,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting { if (!this.isSpectator()) { super.b(blockposition); } diff --git a/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch index 503f4e13d6..10ef22c0a6 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 566b04c264a9312b8b017f43bb074fc8840f6eb0 Mon Sep 17 00:00:00 2001 +From 1ec4298e0b8623b4f2771f75916053b23a0d225c 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 903c07e2f..9a4560599 100644 +index 12156b6e5..47978174e 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 903c07e2f..9a4560599 100644 this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint)); } -@@ -1300,7 +1309,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1326,7 +1335,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.lastHealthSent = -1.0F; this.lastFoodSent = -1; // this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit 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 1bff7c589f..aea2941867 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 dafb32db7aafc0f8a2ac1501aebd2462e72dc9c1 Mon Sep 17 00:00:00 2001 +From 3437308c9316ffdf1306244ba281a0b23eee93cf 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 9a4560599..39d10f870 100644 +index 47978174e..0a1f82c10 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1768,7 +1768,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1794,7 +1794,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override protected boolean isFrozen() { diff --git a/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch index b7a4d6c1a2..c4a37367c1 100644 --- a/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 5c888d03126bcf976558501034db32e15e51ede0 Mon Sep 17 00:00:00 2001 +From 8996cf4eb8f8e366f94047a5fdbf9f808fe2128c 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 ba3e6b8823..2265b01e69 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 ba3e6b8823..2265b01e69 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 39d10f8707..ee28106859 100644 +index 0a1f82c10..9fd94b884 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 39d10f8707..ee28106859 100644 } String deathMessage = event.getDeathMessage(); -@@ -1028,7 +1028,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1054,7 +1054,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return OptionalInt.empty(); } else { if (this.activeContainer != this.defaultContainer) { @@ -64,7 +64,7 @@ index 39d10f8707..ee28106859 100644 } this.nextContainerCounter(); -@@ -1088,7 +1088,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1114,7 +1114,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } // CraftBukkit end if (this.activeContainer != this.defaultContainer) { @@ -73,7 +73,7 @@ index 39d10f8707..ee28106859 100644 } // this.nextContainerCounter(); // CraftBukkit - moved up -@@ -1152,7 +1152,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1178,7 +1178,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void closeInventory() { @@ -88,7 +88,7 @@ index 39d10f8707..ee28106859 100644 this.m(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8757b6751e..4f04410f9b 100644 +index 8757b6751..4f04410f9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2039,7 +2039,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -101,7 +101,7 @@ index 8757b6751e..4f04410f9b 100644 this.player.m(); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 002f7e844a..fd0f5c6f29 100644 +index 002f7e844..fd0f5c6f2 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -403,7 +403,7 @@ public abstract class PlayerList { @@ -114,7 +114,7 @@ index 002f7e844a..fd0f5c6f29 100644 PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game"); cserver.getPluginManager().callEvent(playerQuitEvent); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index abf91bd8ce..fa7b38a5cc 100644 +index abf91bd8c..fa7b38a5c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1036,7 +1036,7 @@ public class WorldServer extends World { @@ -136,7 +136,7 @@ index abf91bd8ce..fa7b38a5cc 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index cd8ad27047..e169679c88 100644 +index cd8ad2704..e169679c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -619,8 +619,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -155,7 +155,7 @@ index cd8ad27047..e169679c88 100644 @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 78a3280995..b93bafb3ff 100644 +index 78a328099..b93bafb3f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -785,7 +785,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -168,7 +168,7 @@ index 78a3280995..b93bafb3ff 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 13598e3bb4..bb48d44ffb 100644 +index 13598e3bb..bb48d44ff 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1292,8 +1292,19 @@ public class CraftEventFactory { 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 5f4f496aff..ba64943fd9 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 3d80d3927d34c8448d1cafafd86ca2896c07e345 Mon Sep 17 00:00:00 2001 +From 79335f2b17824b7c681cb113e96dbed732bb87b9 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 9068aeeec..6a1ceaf69 100644 +index c3e9f9d90..70c9a41ee 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 9068aeeec..6a1ceaf69 100644 public boolean worldChangeInvuln; private boolean cm; private void setHasSeenCredits(boolean has) { this.cm = has; } // Paper - OBFHELPER private final RecipeBookServer recipeBook; -@@ -1557,15 +1557,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1583,15 +1583,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity); } @@ -58,7 +58,7 @@ index 9068aeeec..6a1ceaf69 100644 } @Override -@@ -1573,7 +1593,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1599,7 +1619,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 1c99755e94..0d28b7453f 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 a621710ac30b03e36c7db4cd4f49f6af330fbc11 Mon Sep 17 00:00:00 2001 +From d32552a87b14d231a96e10bbb937a07618f44df6 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 5d31068d7..365984bb8 100644 +index 905d2be5e..95d73fd6e 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 5d31068d7..365984bb8 100644 return 300; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 6a1ceaf69..fe3cb5373 100644 +index 70c9a41ee..2301efa51 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1833,6 +1833,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1859,6 +1859,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 adf475858e..1ec6bd92b2 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 ba2c6651b71525ab731cdcd58df467f389bc42d8 Mon Sep 17 00:00:00 2001 +From 47c875d5a6be96d740cfb05aa88e0bc9d1fcde86 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 365984bb8..0f2480521 100644 +index 95d73fd6e..fef298f55 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 @@ -112,10 +112,10 @@ index b59b39d41..a63edeeb9 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 fe3cb5373..784e472fb 100644 +index e4622e117..5d21fdb71 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -987,11 +987,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1013,11 +1013,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 848137c265..062d18e03a 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 4237f96053ab8546efd78d5d069864ab8c18f2b1 Mon Sep 17 00:00:00 2001 +From 522bea13c79b27397a461b61f271f323b73a08f0 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 8276010a5..ebab423af 100644 +index 886669d6c..fd1a249a1 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1262,6 +1262,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1288,6 +1288,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void n() { this.cq = true; this.ejectPassengers(); diff --git a/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch index 08f0bb3053..43963a87d6 100644 --- a/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From 74764a9936dcd13520c6bcf1e7e7de723bf6f860 Mon Sep 17 00:00:00 2001 +From 6c28f5412e55c6583fa0feea0fa218d2b488410c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option @@ -93,10 +93,10 @@ index c7c600b80..64c327669 100644 int k = MathHelper.floor(entity.locY() / 16.0D); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 96b0917a3..f0d1a5b14 100644 +index 88d7808b2..579ad1c43 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2735,6 +2735,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2740,6 +2740,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke }); } 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 c70ed51a73..0f5350b8ee 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 f82cd75f007f9d831b66f2ef501e942f3cf194f5 Mon Sep 17 00:00:00 2001 +From 190676b36c7fdb635808f8f43b05838893ae5b64 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 f482bb6cb..98a1c633f 100644 +index ed5116bb2..cce209ed1 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 f482bb6cb..98a1c633f 100644 } // Yes, this doesn't match Vanilla, but it's the best we can do for now. -@@ -1737,6 +1743,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1763,6 +1769,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } @@ -643,7 +643,7 @@ index d49ad0308..2fb04e3e9 100644 return this.bb; } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index d9faef8a6..b3ccb9a7b 100644 +index 0ad11ba68..f8a65b3df 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -78,7 +78,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { 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 52b9ebf46d..ba80b95584 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 380f0e8a3892f3ceeea32a0a86d48e466f156366 Mon Sep 17 00:00:00 2001 +From ce2faacbf303eced568ca6939b8d689630d3ff4d 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 98a1c633f..b2d53c57d 100644 +index cce209ed1..5bf13f8bf 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -948,6 +948,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -974,6 +974,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.lastHealthSent = -1.0F; this.lastFoodSent = -1; diff --git a/work/Bukkit b/work/Bukkit index 34f6e645a9..7dd1cfcdbc 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 34f6e645a9edd0cacc3bd5811da801ecae771403 +Subproject commit 7dd1cfcdbcb7b53f66533c85d469cde5646175b7 diff --git a/work/CraftBukkit b/work/CraftBukkit index d208733e70..e8cb2f513b 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit d208733e7087bd3c85ac7bfde618b0cdc372f703 +Subproject commit e8cb2f513b316706aaf8dd47cfff39aad647dce2 diff --git a/work/Spigot b/work/Spigot index 492a779218..037559e7b4 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 492a779218933f1887f97c7fccf24e54b1d18e4e +Subproject commit 037559e7b4721c8a0af0ead3788733886ce9f49d