From 997fa37ee7e3626451b928f067847ec5ce85a6c2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 11 Aug 2016 15:07:07 -0500 Subject: [PATCH] Update upstream B/CB --- Spigot-Server-Patches/0005-Timings-v2.patch | 10 +++++----- .../0026-Entity-Origin-API.patch | 20 +++++++++---------- ...nfigurable-top-of-nether-void-damage.patch | 12 +++++------ ...entation-of-tile-entity-removal-list.patch | 10 +++++----- ...oreboards-for-non-players-by-default.patch | 8 ++++---- ...093-Use-a-Shared-Random-for-Entities.patch | 10 +++++----- .../0094-Don-t-teleport-dead-entities.patch | 8 ++++---- ...nilla-per-world-scoreboard-coloring-.patch | 6 +++--- ...te-PlayerConnection-on-teleporting-p.patch | 8 ++++---- ...6-Vehicle-Event-Cancellation-Changes.patch | 16 +++++++-------- .../0144-Entity-Tracking-Improvements.patch | 8 ++++---- ...52-Optional-old-TNT-cannon-behaviors.patch | 12 +++++------ .../0158-Make-entities-look-for-hoppers.patch | 8 ++++---- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 15 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch index f37f5ba8f7..be15328de2 100644 --- a/Spigot-Server-Patches/0005-Timings-v2.patch +++ b/Spigot-Server-Patches/0005-Timings-v2.patch @@ -1,4 +1,4 @@ -From 35c7f457c6c2ae182fba3e9889a240de77c1c4c8 Mon Sep 17 00:00:00 2001 +From c6be559822362b3a7bab23e04ff580be2fef0192 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -324,7 +324,7 @@ index 11a49a3..e70d5c5 100644 public boolean aa() { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6ac7f42..e6d11ee 100644 +index bb9e6b9..1e85d39 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace; @@ -337,7 +337,7 @@ index 6ac7f42..e6d11ee 100644 import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.vehicle.VehicleBlockCollisionEvent; -@@ -142,7 +143,7 @@ public abstract class Entity implements ICommandListener { +@@ -143,7 +144,7 @@ public abstract class Entity implements ICommandListener { public boolean valid; // CraftBukkit public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949 @@ -346,7 +346,7 @@ index 6ac7f42..e6d11ee 100644 // Spigot start public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); public final boolean defaultActivationState; -@@ -466,7 +467,6 @@ public abstract class Entity implements ICommandListener { +@@ -467,7 +468,6 @@ public abstract class Entity implements ICommandListener { } public void move(double d0, double d1, double d2) { @@ -354,7 +354,7 @@ index 6ac7f42..e6d11ee 100644 if (this.noclip) { this.a(this.getBoundingBox().c(d0, d1, d2)); this.recalcPosition(); -@@ -804,7 +804,6 @@ public abstract class Entity implements ICommandListener { +@@ -805,7 +805,6 @@ public abstract class Entity implements ICommandListener { this.world.methodProfiler.b(); } diff --git a/Spigot-Server-Patches/0026-Entity-Origin-API.patch b/Spigot-Server-Patches/0026-Entity-Origin-API.patch index 92cb674061..70df2c1417 100644 --- a/Spigot-Server-Patches/0026-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0026-Entity-Origin-API.patch @@ -1,14 +1,14 @@ -From fc4c38ca6389c3d313fd655ab29817a38ef6ea42 Mon Sep 17 00:00:00 2001 +From 04d506ad53de647f48493f06fbd2ecea6465f0fb Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index c0e6dc8..60c0db0 100644 +index 1e85d39..395811a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -144,6 +144,7 @@ public abstract class Entity implements ICommandListener { +@@ -145,6 +145,7 @@ public abstract class Entity implements ICommandListener { public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949 public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper @@ -16,7 +16,7 @@ index c0e6dc8..60c0db0 100644 // Spigot start public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); public final boolean defaultActivationState; -@@ -1372,6 +1373,11 @@ public abstract class Entity implements ICommandListener { +@@ -1373,6 +1374,11 @@ public abstract class Entity implements ICommandListener { } } @@ -28,7 +28,7 @@ index c0e6dc8..60c0db0 100644 return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT"); -@@ -1516,6 +1522,13 @@ public abstract class Entity implements ICommandListener { +@@ -1517,6 +1523,13 @@ public abstract class Entity implements ICommandListener { } // CraftBukkit end @@ -42,7 +42,7 @@ index c0e6dc8..60c0db0 100644 } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded"); -@@ -1537,6 +1550,7 @@ public abstract class Entity implements ICommandListener { +@@ -1538,6 +1551,7 @@ public abstract class Entity implements ICommandListener { protected abstract void b(NBTTagCompound nbttagcompound); @@ -51,7 +51,7 @@ index c0e6dc8..60c0db0 100644 NBTTagList nbttaglist = new NBTTagList(); double[] adouble1 = adouble; diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 65c1150..bab3cd6 100644 +index dbcda27..a1392d6 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -246,6 +246,14 @@ public class EntityFallingBlock extends Entity { @@ -89,7 +89,7 @@ index 2745c49..86f3f1f 100644 public EntityLiving getSource() { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index da6b78b..ae37a79 100644 +index e3d971c..5b3e50c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -962,6 +962,12 @@ public abstract class World implements IBlockAccess { @@ -106,7 +106,7 @@ index da6b78b..ae37a79 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 ff7bfdc..5e81076 100644 +index fd3b39c..6f6b90b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -625,4 +625,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -155,5 +155,5 @@ index c493c9c..93843aa 100644 + // Paper end } -- -2.8.3.windows.1 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch index 7498349417..021d06b1b0 100644 --- a/Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch @@ -1,4 +1,4 @@ -From 62b72202a06a326fb3ad80b5fcff791500bd3df1 Mon Sep 17 00:00:00 2001 +From 57fda9063cff2eb244d9802e4a449f30ff528f56 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:58:50 -0600 Subject: [PATCH] Configurable top of nether void damage @@ -20,10 +20,10 @@ index 8fc2f6c..d78b688 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index bb9be9b..18062df 100644 +index 395811a..3228932 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -385,9 +385,15 @@ public abstract class Entity implements ICommandListener { +@@ -386,9 +386,15 @@ public abstract class Entity implements ICommandListener { this.fallDistance *= 0.5F; } @@ -39,7 +39,7 @@ index bb9be9b..18062df 100644 if (!this.world.isClientSide) { this.setFlag(0, this.fireTicks > 0); -@@ -397,6 +403,18 @@ public abstract class Entity implements ICommandListener { +@@ -398,6 +404,18 @@ public abstract class Entity implements ICommandListener { this.world.methodProfiler.b(); } @@ -58,7 +58,7 @@ index bb9be9b..18062df 100644 protected void H() { if (this.portalCooldown > 0) { --this.portalCooldown; -@@ -453,6 +471,7 @@ public abstract class Entity implements ICommandListener { +@@ -454,6 +472,7 @@ public abstract class Entity implements ICommandListener { this.fireTicks = 0; } @@ -87,5 +87,5 @@ index 36ef2da..4438d83 100644 int i; -- -2.8.3 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0065-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0065-Change-implementation-of-tile-entity-removal-list.patch index c6dd883b5a..7522ba49a9 100644 --- a/Spigot-Server-Patches/0065-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0065-Change-implementation-of-tile-entity-removal-list.patch @@ -1,14 +1,14 @@ -From 23113242e70d884bf3091ee1efcda06dd2d71ab8 Mon Sep 17 00:00:00 2001 +From 0c9284853514a380de8e9f43d7826acf7d6e4841 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:39:54 -0600 Subject: [PATCH] Change implementation of (tile)entity removal list diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 18062df..1764791 100644 +index 3228932..cc484dc 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -119,10 +119,10 @@ public abstract class Entity implements ICommandListener { +@@ -120,10 +120,10 @@ public abstract class Entity implements ICommandListener { private static final DataWatcherObject aB = DataWatcher.a(Entity.class, DataWatcherRegistry.h); private static final DataWatcherObject aC = DataWatcher.a(Entity.class, DataWatcherRegistry.h); private static final DataWatcherObject aD = DataWatcher.a(Entity.class, DataWatcherRegistry.h); @@ -24,7 +24,7 @@ index 18062df..1764791 100644 public boolean impulse; public int portalCooldown; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c8c7a41..2bf74ea 100644 +index 5881ffb..a905ff9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -31,6 +31,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; @@ -84,5 +84,5 @@ index c8c7a41..2bf74ea 100644 this.f.clear(); this.l(); -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0071-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0071-Disable-Scoreboards-for-non-players-by-default.patch index 90d9438ace..fcdece686b 100644 --- a/Spigot-Server-Patches/0071-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0071-Disable-Scoreboards-for-non-players-by-default.patch @@ -1,4 +1,4 @@ -From 777ae8cd4930e25569e4bcb8b2a328ab69dbd327 Mon Sep 17 00:00:00 2001 +From c668d31b904f5c02b31e7aa742a746114525e9cb Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 8 Mar 2016 23:25:45 -0500 Subject: [PATCH] Disable Scoreboards for non players by default @@ -37,10 +37,10 @@ index 5f579bc..8e5419d 100644 if (scoreboard.addPlayerToTeam(s2, s)) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1764791..153fc76 100644 +index cc484dc..e1cc3fd 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1894,6 +1894,7 @@ public abstract class Entity implements ICommandListener { +@@ -1895,6 +1895,7 @@ public abstract class Entity implements ICommandListener { @Nullable public ScoreboardTeamBase aQ() { @@ -49,5 +49,5 @@ index 1764791..153fc76 100644 } -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch index 7db6bd353b..8cd6959967 100644 --- a/Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 82647f8664165a4de75aadaf2f5fd2d5381fb670 Mon Sep 17 00:00:00 2001 +From 90236406c3f251ce3d4b4ddd27c64c5c93c88949 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:33:47 -0400 Subject: [PATCH] Use a Shared Random for Entities @@ -6,10 +6,10 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 153fc76..3d5a23c 100644 +index e1cc3fd..a331888 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -44,6 +44,7 @@ public abstract class Entity implements ICommandListener { +@@ -45,6 +45,7 @@ public abstract class Entity implements ICommandListener { // CraftBukkit start private static final int CURRENT_LEVEL = 2; @@ -17,7 +17,7 @@ index 153fc76..3d5a23c 100644 static boolean isLevelAtLeast(NBTTagCompound tag, int level) { return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level; } -@@ -161,7 +162,7 @@ public abstract class Entity implements ICommandListener { +@@ -162,7 +163,7 @@ public abstract class Entity implements ICommandListener { this.width = 0.6F; this.length = 1.8F; this.ax = 1; @@ -27,5 +27,5 @@ index 153fc76..3d5a23c 100644 this.justCreated = true; this.uniqueID = MathHelper.a(this.random); -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch index 265fbda4cd..db0ca10771 100644 --- a/Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From d4bfe7c6ef08e98c0fbf19c0ae777ab2a9208245 Mon Sep 17 00:00:00 2001 +From d1a67cfcf8e2dca784c8088bd33c3235d297bf7d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities @@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3d5a23c..3ed3732 100644 +index a331888..ffae109 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2144,7 +2144,7 @@ public abstract class Entity implements ICommandListener { +@@ -2151,7 +2151,7 @@ public abstract class Entity implements ICommandListener { } public Entity teleportTo(Location exit, boolean portal) { @@ -20,5 +20,5 @@ index 3d5a23c..3ed3732 100644 WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle(); int i = worldserver1.dimension; -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index 9de3d94593..03b6b93539 100644 --- a/Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,4 +1,4 @@ -From 0ea52d115bdd752a9fd11d10c804aca8a896cdfc Mon Sep 17 00:00:00 2001 +From c9541f52a6d03f5c73959d649b1b67b8b4c7e2f2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 6 Apr 2016 01:04:23 -0500 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names @@ -19,10 +19,10 @@ index 203dafc..66cd256 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3ed3732..3821f28 100644 +index ffae109..34c00eb 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1893,6 +1893,7 @@ public abstract class Entity implements ICommandListener { +@@ -1894,6 +1894,7 @@ public abstract class Entity implements ICommandListener { return this.getFlag(5); } diff --git a/Spigot-Server-Patches/0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch b/Spigot-Server-Patches/0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch index 7e13f01795..798a3fd86a 100644 --- a/Spigot-Server-Patches/0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch +++ b/Spigot-Server-Patches/0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch @@ -1,4 +1,4 @@ -From 49ba8a273d1783da2a16c2d20f58e4039f25dd63 Mon Sep 17 00:00:00 2001 +From 92d4e34934d27a18a3b1c58a61d792b3cd940a12 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Apr 2016 22:36:10 -0400 Subject: [PATCH] SPIGOT-1903: Update PlayerConnection on teleporting players @@ -7,10 +7,10 @@ Otherwise the player will trigger a "moved too quickly" next movement packet and rubber band. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3ed3732..eff088d 100644 +index 34c00eb..b38cb3f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -292,6 +292,7 @@ public abstract class Entity implements ICommandListener { +@@ -293,6 +293,7 @@ public abstract class Entity implements ICommandListener { this.locX = d0; this.locY = d1; this.locZ = d2; @@ -19,7 +19,7 @@ index 3ed3732..eff088d 100644 float f1 = this.length; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f7eaa6f..278e253 100644 +index 999f381..301c67d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -204,7 +204,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0136-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0136-Vehicle-Event-Cancellation-Changes.patch index 92da6a3987..9752c30b3a 100644 --- a/Spigot-Server-Patches/0136-Vehicle-Event-Cancellation-Changes.patch +++ b/Spigot-Server-Patches/0136-Vehicle-Event-Cancellation-Changes.patch @@ -1,14 +1,14 @@ -From 7563254d185f9f3e5dbcceee91d50bb6cb11699e Mon Sep 17 00:00:00 2001 +From 2f64952c25423e7d2a2926b042dcf93d589634ec Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 18:20:05 -0500 Subject: [PATCH] Vehicle Event Cancellation Changes diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index eff088d..c3efc7f 100644 +index b38cb3f..10d732f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1699,6 +1699,10 @@ public abstract class Entity implements ICommandListener { +@@ -1700,6 +1700,10 @@ public abstract class Entity implements ICommandListener { } public boolean a(Entity entity, boolean flag) { @@ -19,7 +19,7 @@ index eff088d..c3efc7f 100644 if (!flag && (!this.n(entity) || !entity.q(this))) { return false; } else { -@@ -1707,7 +1711,7 @@ public abstract class Entity implements ICommandListener { +@@ -1708,7 +1712,7 @@ public abstract class Entity implements ICommandListener { } this.au = entity; @@ -28,7 +28,7 @@ index eff088d..c3efc7f 100644 return true; } } -@@ -1734,12 +1738,20 @@ public abstract class Entity implements ICommandListener { +@@ -1735,12 +1739,20 @@ public abstract class Entity implements ICommandListener { } protected void o(Entity entity) { @@ -49,7 +49,7 @@ index eff088d..c3efc7f 100644 CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle(); Entity orig = craft == null ? null : craft.getHandle(); if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, false)) { // Boolean not used -@@ -1762,6 +1774,8 @@ public abstract class Entity implements ICommandListener { +@@ -1763,6 +1775,8 @@ public abstract class Entity implements ICommandListener { return; } // Spigot end @@ -58,7 +58,7 @@ index eff088d..c3efc7f 100644 if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bw() instanceof EntityHuman)) { this.passengers.add(0, entity); } else { -@@ -1787,16 +1801,29 @@ public abstract class Entity implements ICommandListener { +@@ -1788,16 +1802,29 @@ public abstract class Entity implements ICommandListener { CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle(); Entity n = craftn == null ? null : craftn.getHandle(); if (event.isCancelled() || n != orig) { @@ -90,5 +90,5 @@ index eff088d..c3efc7f 100644 return this.bx().size() < 1; } -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0144-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0144-Entity-Tracking-Improvements.patch index c58a5057b3..008ff94949 100644 --- a/Spigot-Server-Patches/0144-Entity-Tracking-Improvements.patch +++ b/Spigot-Server-Patches/0144-Entity-Tracking-Improvements.patch @@ -1,4 +1,4 @@ -From d603d2df6455409178a399ba768cdd684d3d8a1d Mon Sep 17 00:00:00 2001 +From 152c03f65c7028a3b726d2cb0817c4e4e507193b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Jun 2013 01:24:00 -0400 Subject: [PATCH] Entity Tracking Improvements @@ -7,10 +7,10 @@ If any part of a Vehicle/Passenger relationship is visible to a player, send all passenger/vehicles to the player in the chain. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4b2f804..4a7ca49 100644 +index 10d732f..68f9175 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -51,6 +51,7 @@ public abstract class Entity implements ICommandListener { +@@ -52,6 +52,7 @@ public abstract class Entity implements ICommandListener { protected CraftEntity bukkitEntity; @@ -99,5 +99,5 @@ index f505e3c..c2113d7 100644 } -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0152-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0152-Optional-old-TNT-cannon-behaviors.patch index 4f40b20139..7f142ad296 100644 --- a/Spigot-Server-Patches/0152-Optional-old-TNT-cannon-behaviors.patch +++ b/Spigot-Server-Patches/0152-Optional-old-TNT-cannon-behaviors.patch @@ -1,4 +1,4 @@ -From e4ce90b99673cf5fafa0f7235753c3b449ef3866 Mon Sep 17 00:00:00 2001 +From 985f3cfbab21e82b59ed6e8488a9aac30aa86f00 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional old TNT cannon behaviors @@ -208,10 +208,10 @@ index 8530952..b50e3d6 100644 world.getServer().getPluginManager().callEvent(event); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4a7ca49..fbf114f 100644 +index 68f9175..41ef058 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -979,6 +979,12 @@ public abstract class Entity implements ICommandListener { +@@ -980,6 +980,12 @@ public abstract class Entity implements ICommandListener { } public boolean ak() { @@ -224,7 +224,7 @@ index 4a7ca49..fbf114f 100644 if (this.bB() instanceof EntityBoat) { this.inWater = false; } else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) { -@@ -1180,6 +1186,12 @@ public abstract class Entity implements ICommandListener { +@@ -1181,6 +1187,12 @@ public abstract class Entity implements ICommandListener { } public double f(double d0, double d1, double d2) { @@ -237,7 +237,7 @@ index 4a7ca49..fbf114f 100644 double d3 = this.locX - d0; double d4 = this.locY - d1; double d5 = this.locZ - d2; -@@ -1234,6 +1246,12 @@ public abstract class Entity implements ICommandListener { +@@ -1235,6 +1247,12 @@ public abstract class Entity implements ICommandListener { } public void g(double d0, double d1, double d2) { @@ -250,7 +250,7 @@ index 4a7ca49..fbf114f 100644 this.motX += d0; this.motY += d1; this.motZ += d2; -@@ -2353,6 +2371,12 @@ public abstract class Entity implements ICommandListener { +@@ -2360,6 +2378,12 @@ public abstract class Entity implements ICommandListener { } public boolean bg() { diff --git a/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch index b40251777e..40b573de2d 100644 --- a/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch +++ b/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch @@ -1,4 +1,4 @@ -From 610d21cb97d0f91919916b135a646f3ece9b78a6 Mon Sep 17 00:00:00 2001 +From c04bd923fdd256e0a025c7282c7f49c7328ccad1 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 @@ -132,10 +132,10 @@ index d6cc51b..5bbaa87 100644 this.b = i; this.c = j; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fbf114f..d26ffa7 100644 +index 41ef058..de78029 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -77,6 +77,19 @@ public abstract class Entity implements ICommandListener { +@@ -78,6 +78,19 @@ public abstract class Entity implements ICommandListener { public double locX; public double locY; public double locZ; @@ -370,5 +370,5 @@ index a651961..1f5de89 100644 if (!list.isEmpty()) { -- -2.9.0 +2.9.2.windows.1 diff --git a/work/Bukkit b/work/Bukkit index 18490e51b1..b513e19ee0 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 18490e51b1665bf838cebd163d11f1aabde4cffe +Subproject commit b513e19ee0ddd8e0dab895dc3a195a5a91a87989 diff --git a/work/CraftBukkit b/work/CraftBukkit index 6053c5c8ac..5e5cf84f2c 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 6053c5c8ac74f5e200fe1702fe7ae55bce618460 +Subproject commit 5e5cf84f2cca025d123ab6ddca9e361cf44bfc61