From a68f5fbec0974debba18601fb308b1ea7fbe5e41 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 24 Nov 2016 21:12:18 -0600 Subject: [PATCH] Update upstream B/CB/S --- ...6-Vanished-players-don-t-have-rights.patch | 8 ++--- .../0024-Entity-Origin-API.patch | 10 +++--- .../0150-Make-entities-look-for-hoppers.patch | 10 +++--- ...Add-hit-entity-to-ProjectileHitEvent.patch | 32 +++++++++---------- ...79-Cache-user-authenticator-threads.patch} | 4 +-- ...jectileHitEvent-call-to-proper-place.patch | 30 ----------------- ...atch => 0180-Optimize-Network-Queue.patch} | 4 +-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 10 files changed, 36 insertions(+), 68 deletions(-) rename Spigot-Server-Patches/{0180-Cache-user-authenticator-threads.patch => 0179-Cache-user-authenticator-threads.patch} (97%) delete mode 100644 Spigot-Server-Patches/0179-Move-ProjectileHitEvent-call-to-proper-place.patch rename Spigot-Server-Patches/{0181-Optimize-Network-Queue.patch => 0180-Optimize-Network-Queue.patch} (92%) diff --git a/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch index 152458ca1..a8ed85a67 100644 --- a/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From 70093c6d868924d6d2947cd7a5e952144c9cb44d Mon Sep 17 00:00:00 2001 +From c41f57a6a44ef40c5010c2fadaa6e583183c7995 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:20:21 -0600 Subject: [PATCH] Vanished players don't have rights @@ -24,7 +24,7 @@ index ca84d92..287566c 100644 this.a(movingobjectposition); } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 0b28c88..91702f2 100644 +index bfbae25..c8837be 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -224,6 +224,15 @@ public class EntityFishingHook extends Entity { @@ -41,8 +41,8 @@ index 0b28c88..91702f2 100644 + // Paper end + if (movingobjectposition != null) { - org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); // Craftbukkit - Call event vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z); + } diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java index 40ac335..3d5548f 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java @@ -95,5 +95,5 @@ index 78b5a3c..2a38b1c 100644 return false; } -- -2.10.2 +2.10.2.windows.1 diff --git a/Spigot-Server-Patches/0024-Entity-Origin-API.patch b/Spigot-Server-Patches/0024-Entity-Origin-API.patch index f4c5fbcd3..8652e76fa 100644 --- a/Spigot-Server-Patches/0024-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0024-Entity-Origin-API.patch @@ -1,4 +1,4 @@ -From d67a5caa6bb6004252668cda3001ccd9180c5e5a Mon Sep 17 00:00:00 2001 +From cb0c2ac1cdfc0d75128d4db894e6bf600a8ff0e9 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API @@ -89,7 +89,7 @@ index fd07356..25e471d 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 52171a3..4db969b 100644 +index 3d70c50..eb0483d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess { @@ -106,10 +106,10 @@ index 52171a3..4db969b 100644 flag = true; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 72fd019..f8aabe2 100644 +index e4fbcf2..5b01727 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -672,4 +672,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -675,4 +675,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return spigot; } // Spigot end @@ -155,5 +155,5 @@ index c493c9c..93843aa 100644 + // Paper end } -- -2.10.2 +2.10.2.windows.1 diff --git a/Spigot-Server-Patches/0150-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0150-Make-entities-look-for-hoppers.patch index 9678792ad..caba9a350 100644 --- a/Spigot-Server-Patches/0150-Make-entities-look-for-hoppers.patch +++ b/Spigot-Server-Patches/0150-Make-entities-look-for-hoppers.patch @@ -1,4 +1,4 @@ -From b8a3dee372701192f4254369f08f699941c83428 Mon Sep 17 00:00:00 2001 +From 0d78e997b13f2330eb8721d24bde7a39dd0182a9 Mon Sep 17 00:00:00 2001 From: Techcable Date: Sat, 18 Jun 2016 01:01:37 -0500 Subject: [PATCH] Make entities look for hoppers @@ -168,7 +168,7 @@ index a262eda..7de4b5b 100644 public double motY; public double motZ; diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 6d70253..bde1681 100644 +index 6fc56f4..cdb3586 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -5,8 +5,15 @@ import javax.annotation.Nullable; @@ -188,7 +188,7 @@ index 6d70253..bde1681 100644 private static final Logger b = LogManager.getLogger(); private static final DataWatcherObject c = DataWatcher.a(EntityItem.class, DataWatcherRegistry.f); -@@ -61,6 +68,7 @@ public class EntityItem extends Entity { +@@ -56,6 +63,7 @@ public class EntityItem extends Entity { this.die(); } else { super.A_(); @@ -196,7 +196,7 @@ index 6d70253..bde1681 100644 // CraftBukkit start - Use wall time for pickup and despawn timers int elapsedTicks = MinecraftServer.currentTick - this.lastTick; if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks; -@@ -148,6 +156,7 @@ public class EntityItem extends Entity { +@@ -143,6 +151,7 @@ public class EntityItem extends Entity { // Spigot start - copied from above @Override public void inactiveTick() { @@ -390,5 +390,5 @@ index 4ebcf47..41cc568 100644 if (!list.isEmpty()) { -- -2.10.2 +2.10.2.windows.1 diff --git a/Spigot-Server-Patches/0172-Add-hit-entity-to-ProjectileHitEvent.patch b/Spigot-Server-Patches/0172-Add-hit-entity-to-ProjectileHitEvent.patch index 53fbe9755..93208bba7 100644 --- a/Spigot-Server-Patches/0172-Add-hit-entity-to-ProjectileHitEvent.patch +++ b/Spigot-Server-Patches/0172-Add-hit-entity-to-ProjectileHitEvent.patch @@ -1,4 +1,4 @@ -From d61e3c6a3da9d7a3f34fce5580f222bfa92482a6 Mon Sep 17 00:00:00 2001 +From 6f81a88ba6c88fd8ac2f420dc4010b7b9999d2d0 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Wed, 21 Sep 2016 20:40:46 -0700 Subject: [PATCH] Add hit entity to ProjectileHitEvent @@ -31,18 +31,18 @@ index 45e5972..88372f3 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index e0475ce..395f30b 100644 +index 59a3748..157e32c 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java -@@ -234,7 +234,7 @@ public class EntityFishingHook extends Entity { - // Paper end - - if (movingobjectposition != null) { -- org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); // Craftbukkit - Call event -+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition.entity); // Craftbukkit - Call event // Paper - Include entity in movingobjectposition - vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z); +@@ -265,7 +265,7 @@ public class EntityFishingHook extends Entity { } + if (movingobjectposition != null && movingobjectposition.type != MovingObjectPosition.EnumMovingObjectType.MISS) { +- org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); // Craftbukkit - Call event ++ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition.entity); // Craftbukkit - Call event + if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.ENTITY) { + this.hooked = movingobjectposition.entity; + this.s(); diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java index 3d5548f..0dbd66a 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java @@ -57,13 +57,14 @@ index 3d5548f..0dbd66a 100644 // CraftBukkit end } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f80856a..4ce1980 100644 +index 64d4f7e..b9e910d 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -784,6 +784,15 @@ public class CraftEventFactory { +@@ -1037,4 +1037,13 @@ public class CraftEventFactory { + child.world.getServer().getPluginManager().callEvent(event); return event; } - ++ + // Paper start + public static ProjectileHitEvent callProjectileHitEvent(Entity entity, Entity hitEntity) { + ProjectileHitEvent event = new ProjectileHitEvent((Projectile) entity.getBukkitEntity(), (hitEntity == null ? null : hitEntity.getBukkitEntity())); @@ -72,10 +73,7 @@ index f80856a..4ce1980 100644 + return event; + } + // Paper end -+ - public static ExpBottleEvent callExpBottleEvent(Entity entity, int exp) { - ThrownExpBottle bottle = (ThrownExpBottle) entity.getBukkitEntity(); - ExpBottleEvent event = new ExpBottleEvent(bottle, exp); + } -- -2.10.2 +2.10.2.windows.1 diff --git a/Spigot-Server-Patches/0180-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0179-Cache-user-authenticator-threads.patch similarity index 97% rename from Spigot-Server-Patches/0180-Cache-user-authenticator-threads.patch rename to Spigot-Server-Patches/0179-Cache-user-authenticator-threads.patch index b29e3e390..0432f17b3 100644 --- a/Spigot-Server-Patches/0180-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0179-Cache-user-authenticator-threads.patch @@ -1,4 +1,4 @@ -From 11b78bf97802008e0ce97821d1a9760a845c4062 Mon Sep 17 00:00:00 2001 +From 0bdec6d553141cddeaf775576abc30a666dcc6e9 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads @@ -63,5 +63,5 @@ index fe390fe..350ec03 100644 } -- -2.10.2 +2.10.2.windows.1 diff --git a/Spigot-Server-Patches/0179-Move-ProjectileHitEvent-call-to-proper-place.patch b/Spigot-Server-Patches/0179-Move-ProjectileHitEvent-call-to-proper-place.patch deleted file mode 100644 index eea928b19..000000000 --- a/Spigot-Server-Patches/0179-Move-ProjectileHitEvent-call-to-proper-place.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d53a1a9a43aed5dc7b733fceca073bf954966f27 Mon Sep 17 00:00:00 2001 -From: AlphaBlend -Date: Mon, 21 Nov 2016 22:21:53 -0800 -Subject: [PATCH] Move ProjectileHitEvent call to proper place - - -diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 395f30b..9f631d1 100644 ---- a/src/main/java/net/minecraft/server/EntityFishingHook.java -+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java -@@ -234,7 +234,7 @@ public class EntityFishingHook extends Entity { - // Paper end - - if (movingobjectposition != null) { -- org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition.entity); // Craftbukkit - Call event // Paper - Include entity in movingobjectposition -+ //org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition.entity); // Craftbukkit - Call event // Paper - Wrong location, moved down to proper location - vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z); - } - -@@ -267,6 +267,7 @@ public class EntityFishingHook extends Entity { - - if (movingobjectposition != null && movingobjectposition.type != MovingObjectPosition.EnumMovingObjectType.MISS) { - if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.ENTITY) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition.entity); // Craftbukkit - Call event // Paper - Include entity in movingobjectposition - this.hooked = movingobjectposition.entity; - this.s(); - } else { --- -2.10.0.windows.1 - diff --git a/Spigot-Server-Patches/0181-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0180-Optimize-Network-Queue.patch similarity index 92% rename from Spigot-Server-Patches/0181-Optimize-Network-Queue.patch rename to Spigot-Server-Patches/0180-Optimize-Network-Queue.patch index 5921bf753..1f0420cf2 100644 --- a/Spigot-Server-Patches/0181-Optimize-Network-Queue.patch +++ b/Spigot-Server-Patches/0180-Optimize-Network-Queue.patch @@ -1,4 +1,4 @@ -From 43efcd35598c5cfcfec9845b843c7a3ce1380b20 Mon Sep 17 00:00:00 2001 +From a1667a7504d226aedfe54e26e4196cc1717f8abe Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:54:56 -0500 Subject: [PATCH] Optimize Network Queue @@ -18,5 +18,5 @@ index 683ace3..b4adf7e 100644 private long ab = aw(); -- -2.8.3.windows.1 +2.10.2.windows.1 diff --git a/work/Bukkit b/work/Bukkit index d986a3f77..beb397972 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit d986a3f774df1628dcfbd25730dfdbfe4471a447 +Subproject commit beb39797294b37e7d444d1ad62404f7a43552a2b diff --git a/work/CraftBukkit b/work/CraftBukkit index b5b0a97d4..78c761434 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit b5b0a97d44df120d69b6102b7b1f702c8b917cd3 +Subproject commit 78c7614349845f26cdb39514b7015e1c220dab37 diff --git a/work/Spigot b/work/Spigot index 0f17cfb6c..31fef093d 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 0f17cfb6c463710def7e7ea8b9b93d91df09231c +Subproject commit 31fef093d5fe506081252010e3952d7b6b3a5476