From f9f1a2e97e4d3977543a04b8e9f6e60b615b8573 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 27 Jul 2016 17:46:02 -0500 Subject: [PATCH] Cleanup obfuscation helper comment format --- .../0011-Add-BeaconEffectEvent.patch | 4 ++-- Spigot-Server-Patches/0004-MC-Utils.patch | 10 +++++----- ...nilla-per-world-scoreboard-coloring-.patch | 20 +++++++++++++++---- ...te-PlayerConnection-on-teleporting-p.patch | 8 ++++---- ...Improve-Minecraft-Hopper-Performance.patch | 8 ++++---- ...item-frames-performance-and-bug-fixe.patch | 10 +++++----- ...-API-Replenishable-Lootables-Feature.patch | 20 +++++++++---------- .../0147-Fix-Chunk-Unload-Queue-Issues.patch | 8 ++++---- ...blocking-on-Network-Manager-creation.patch | 6 +++--- ...52-Optional-old-TNT-cannon-behaviors.patch | 6 +++--- .../0158-Make-entities-look-for-hoppers.patch | 10 +++++----- ...from-the-correct-hand-when-spawn-egg.patch | 8 ++++---- 12 files changed, 65 insertions(+), 53 deletions(-) diff --git a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch index 0f8bb9975..2a346c3cc 100644 --- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch +++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From 93d98d9a2a4d8cbef43ca5b9e7fbad4d6cf925a5 Mon Sep 17 00:00:00 2001 +From 0aa465c3441c5e1668d2437c0c6cf5dc15b1744d Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:09:40 -0600 Subject: [PATCH] Add BeaconEffectEvent @@ -92,5 +92,5 @@ index 0000000..6579ae9 + } +} -- -2.8.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index d05412c1f..d2b326df1 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -1,4 +1,4 @@ -From 39d7a1ae851dc10f15ff92f7bd248b0a784e20dd Mon Sep 17 00:00:00 2001 +From 061f2ed91f27177f156e65fc6762787aeb9616ff Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils @@ -222,7 +222,7 @@ index 0000000..fe7b476 + } +} diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index 154a2d5..f8a624e 100644 +index 154a2d5..b6a20c5 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; @@ -238,13 +238,13 @@ index 154a2d5..f8a624e 100644 this.map.put(s, new NBTTagLong(i)); } -+ public void setUUID(String prefix, UUID uuid) { a(prefix, uuid); } // Paper // OBFHELPER ++ public void setUUID(String prefix, UUID uuid) { a(prefix, uuid); } // Paper - OBFHELPER public void a(String s, UUID uuid) { this.setLong(s + "Most", uuid.getMostSignificantBits()); this.setLong(s + "Least", uuid.getLeastSignificantBits()); } -+ public UUID getUUID(String prefix) { return a(prefix); } // Paper // OBFHELPER ++ public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER @Nullable public UUID a(String s) { return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least")); @@ -262,5 +262,5 @@ index 13b93a4..ffe2353 100644 public NBTTagList() {} -- -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 473c60f2c..9de3d9459 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 285bc08b9e9f49e83e80fcc91de4b1111f2aadcf Mon Sep 17 00:00:00 2001 +From 0ea52d115bdd752a9fd11d10c804aca8a896cdfc 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 @@ -18,8 +18,20 @@ index 203dafc..66cd256 100644 + useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false); + } } +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index 3ed3732..3821f28 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 { + return this.getFlag(5); + } + ++ @Nullable public ScoreboardTeamBase getTeam() { return this.aQ(); } // Paper - OBFHELPER + @Nullable + public ScoreboardTeamBase aQ() { + if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b983540..f7eaa6f 100644 +index b983540..999f381 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1346,7 +1346,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -30,7 +42,7 @@ index b983540..f7eaa6f 100644 + // Paper Start - (Meh) Support for vanilla world scoreboard name coloring + String displayName = event.getPlayer().getDisplayName(); + if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) { -+ displayName = ScoreboardTeam.getPlayerDisplayName(this.player.aQ(), player.getDisplayName()); ++ displayName = ScoreboardTeam.getPlayerDisplayName(this.player.getTeam(), player.getDisplayName()); + } + + s = String.format(event.getFormat(), displayName, event.getMessage()); @@ -39,5 +51,5 @@ index b983540..f7eaa6f 100644 if (((LazyPlayerSet) event.getRecipients()).isLazy()) { for (Object recipient : minecraftServer.getPlayerList().players) { -- -2.9.0 +2.9.2.windows.1 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 5f72652c9..7e13f0179 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 47a88a076b3eb494fcc42700e2bdba19dfe5fdbd Mon Sep 17 00:00:00 2001 +From 49ba8a273d1783da2a16c2d20f58e4039f25dd63 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 @@ -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..85c62cd 100644 +index f7eaa6f..278e253 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 { @@ -27,10 +27,10 @@ index f7eaa6f..85c62cd 100644 } - private void d() { -+ public void captureCurrentPosition() { d(); } private void d() { // Paper // OBFHELPER ++ public void captureCurrentPosition() { d(); } private void d() { // Paper - OBFHELPER this.l = this.player.locX; this.m = this.player.locY; this.n = this.player.locZ; -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0139-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0139-Improve-Minecraft-Hopper-Performance.patch index 7dcedaa51..3bc4f6aa8 100644 --- a/Spigot-Server-Patches/0139-Improve-Minecraft-Hopper-Performance.patch +++ b/Spigot-Server-Patches/0139-Improve-Minecraft-Hopper-Performance.patch @@ -1,4 +1,4 @@ -From 8e260c809d1afee280d65923fb11060cfa9f816b Mon Sep 17 00:00:00 2001 +From ecdca7963b3facd652fc2a6a60e3c49c3018e8f8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Improve Minecraft Hopper Performance @@ -27,7 +27,7 @@ index 9fa93ed..cd39fe5 100644 this.h = iblockdata.getBlock().toLegacyData(iblockdata); diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index d1ce2b9..0d521ca 100644 +index d1ce2b9..a651961 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -188,6 +188,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -61,10 +61,10 @@ index d1ce2b9..0d521ca 100644 this.g = i; } -+ boolean isCooledDown() { return o(); } // Paper // OBFHELPER ++ boolean isCooledDown() { return o(); } // Paper - OBFHELPER public boolean o() { return this.g > 0; } -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index e0cd27eaf..b9dd1a77d 100644 --- a/Spigot-Server-Patches/0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From d82a27a283eead01abc6d430db1858d92fcd5614 Mon Sep 17 00:00:00 2001 +From a61e59187e307c3585736ee0ef9994fd376286ea Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes @@ -48,7 +48,7 @@ index 413925e..f505e3c 100644 Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 71c5596..1d47a117 100644 +index 71c5596..1d47a11 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1157,6 +1157,7 @@ public abstract class World implements IBlockAccess { @@ -60,7 +60,7 @@ index 71c5596..1d47a117 100644 } } diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java -index 79a4927..d5707bf 100644 +index 79a4927..9fca678 100644 --- a/src/main/java/net/minecraft/server/WorldMap.java +++ b/src/main/java/net/minecraft/server/WorldMap.java @@ -27,6 +27,7 @@ public class WorldMap extends PersistentBase { @@ -91,7 +91,7 @@ index 79a4927..d5707bf 100644 return nbttagcompound; } -+ public void updateSeenPlayers(EntityHuman entityhuman, ItemStack itemstack) { a(entityhuman, itemstack); } // Paper // OBFHELPER ++ public void updateSeenPlayers(EntityHuman entityhuman, ItemStack itemstack) { a(entityhuman, itemstack); } // Paper - OBFHELPER public void a(EntityHuman entityhuman, ItemStack itemstack) { if (!this.j.containsKey(entityhuman)) { WorldMap.WorldMapHumanTracker worldmap_worldmaphumantracker = new WorldMap.WorldMapHumanTracker(entityhuman); @@ -145,5 +145,5 @@ index 256a131..5768cd5 100644 public RenderData() { -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0142-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0142-LootTable-API-Replenishable-Lootables-Feature.patch index 0698f36fa..c3af00127 100644 --- a/Spigot-Server-Patches/0142-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0142-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From e3e59a3f8a478c2cb64be5034fd90c9fa8f7b010 Mon Sep 17 00:00:00 2001 +From 8cf43482e402de894fdaa197178c93795520c464 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature @@ -418,7 +418,7 @@ index 0000000..01c2713 + } +} diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java -index d0c577d..b808716 100644 +index d0c577d..a9b8cfd 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java @@ -5,17 +5,21 @@ import javax.annotation.Nullable; @@ -441,7 +441,7 @@ index d0c577d..b808716 100644 private boolean b = true; private MinecraftKey c; - private long d; -+ private long d;public long getLootTableSeed() { return d; } // Paper // OBFHELPER ++ private long d;public long getLootTableSeed() { return d; } // Paper - OBFHELPER // CraftBukkit start public List transaction = new java.util.ArrayList(); @@ -490,14 +490,14 @@ index d0c577d..b808716 100644 } -+ public void setLootTable(MinecraftKey key, long seed) { a(key, seed);} // Paper // OBFHELPER ++ public void setLootTable(MinecraftKey key, long seed) { a(key, seed);} // Paper - OBFHELPER public void a(MinecraftKey minecraftkey, long i) { this.c = minecraftkey; this.d = i; } + -+ public MinecraftKey getLootTableKey() { return b(); } // Paper // OBFHELPER ++ public MinecraftKey getLootTableKey() { return b(); } // Paper - OBFHELPER public MinecraftKey b() { return this.c; } @@ -540,7 +540,7 @@ index d0c577d..b808716 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java -index ef81867..3b42152 100644 +index ef81867..b3c9f23 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -1,43 +1,49 @@ @@ -558,7 +558,7 @@ index ef81867..3b42152 100644 protected MinecraftKey m; - protected long n; -+ protected long n; public long getLootTableSeed() { return n; } // Paper // OBFHELPER ++ protected long n; public long getLootTableSeed() { return n; } // Paper - OBFHELPER public TileEntityLootable() {} @@ -603,12 +603,12 @@ index ef81867..3b42152 100644 } -+ public MinecraftKey getLootTableKey() { return b(); } // Paper // OBFHELPER ++ public MinecraftKey getLootTableKey() { return b(); } // Paper - OBFHELPER public MinecraftKey b() { return this.m; } -+ public void setLootTable(MinecraftKey key, long seed) { a(key, seed);} // Paper // OBFHELPER ++ public void setLootTable(MinecraftKey key, long seed) { a(key, seed);} // Paper - OBFHELPER public void a(MinecraftKey minecraftkey, long i) { this.m = minecraftkey; this.n = i; @@ -752,5 +752,5 @@ index e9963e2..acb4dee 100644 CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) { -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0147-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0147-Fix-Chunk-Unload-Queue-Issues.patch index f4ed05cd1..d7f100a1f 100644 --- a/Spigot-Server-Patches/0147-Fix-Chunk-Unload-Queue-Issues.patch +++ b/Spigot-Server-Patches/0147-Fix-Chunk-Unload-Queue-Issues.patch @@ -1,4 +1,4 @@ -From 92791e6828546727d6ef0b510e719e54ec9a46bf Mon Sep 17 00:00:00 2001 +From a06864c10506a3c3bd98ef3ab107e240a6b04b61 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 02:03:56 -0400 Subject: [PATCH] Fix Chunk Unload Queue Issues @@ -9,7 +9,7 @@ has not resolved all the bugs with the changes. This patch fixes known issues and really should be applied by Spigot team. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index a2d9f62..a1f7e83 100644 +index a2d9f62..a9f6efa 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -46,7 +46,7 @@ public class Chunk { @@ -17,7 +17,7 @@ index a2d9f62..a1f7e83 100644 private int x; private ConcurrentLinkedQueue y; - public boolean d; -+ public boolean d;public void setShouldUnload(boolean unload) { this.d = unload; } public boolean isUnloading() { return d; } // Paper // OBFHELPER ++ public boolean d;public void setShouldUnload(boolean unload) { this.d = unload; } public boolean isUnloading() { return d; } // Paper - OBFHELPER protected gnu.trove.map.hash.TObjectIntHashMap entityCount = new gnu.trove.map.hash.TObjectIntHashMap(); // Spigot // Paper start @@ -34,5 +34,5 @@ index d4587c7..804a0ca 100644 continue; } -- -2.9.0 +2.9.2.windows.1 diff --git a/Spigot-Server-Patches/0151-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0151-Avoid-blocking-on-Network-Manager-creation.patch index 0b48dc94e..ec2ffe6ae 100644 --- a/Spigot-Server-Patches/0151-Avoid-blocking-on-Network-Manager-creation.patch +++ b/Spigot-Server-Patches/0151-Avoid-blocking-on-Network-Manager-creation.patch @@ -1,4 +1,4 @@ -From c3d43cd0b8770d66971b7b80430b67b1694bb7a1 Mon Sep 17 00:00:00 2001 +From 5fe7267a04a4233df435f914ceb79aa8b1b147b0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation @@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation Per Paper issue 294 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index 5b0488a..25867be 100644 +index 5b0488a..8906d7c 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -60,6 +60,17 @@ public class ServerConnection { @@ -17,7 +17,7 @@ index 5b0488a..25867be 100644 + private final List pending = Collections.synchronizedList(Lists.newArrayList()); + private void addPending() { + synchronized (pending) { -+ synchronized (this.h) { // Paper // OBFHELPER - List of network managers ++ synchronized (this.h) { // Paper - OBFHELPER - List of network managers + this.h.addAll(pending); + pending.clear(); + } 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 7734e526c..4f40b2013 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 f4843a279527a5ea8ccaedcdf1de0b6ca2c30a02 Mon Sep 17 00:00:00 2001 +From e4ce90b99673cf5fafa0f7235753c3b449ef3866 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,7 +208,7 @@ 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 797e078..e21769f 100644 +index 4a7ca49..fbf114f 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 { @@ -250,7 +250,7 @@ index 797e078..e21769f 100644 this.motX += d0; this.motY += d1; this.motZ += d2; -@@ -2352,6 +2370,12 @@ public abstract class Entity implements ICommandListener { +@@ -2353,6 +2371,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 75740010b..cf8efab73 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 c4306f7afe0f8ac12e6a8ab50bc198532fbdef1c Mon Sep 17 00:00:00 2001 +From 0f33dcc2f6a2a72926f3554e1b1ccab73a0203fa 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 @@ -92,14 +92,14 @@ index cc5e299..b811775 100644 + } } diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index 8c64279..39e63be 100644 +index 8c64279..4445ae7 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -191,6 +191,7 @@ public class AxisAlignedBB { } } -+ public final boolean intersects(AxisAlignedBB intersecting) { return this.b(intersecting); } ++ public final boolean intersects(AxisAlignedBB intersecting) { return this.b(intersecting); } // Paper - OBFHELPER public boolean b(AxisAlignedBB axisalignedbb) { return this.a(axisalignedbb.a, axisalignedbb.b, axisalignedbb.c, axisalignedbb.d, axisalignedbb.e, axisalignedbb.f); } @@ -193,7 +193,7 @@ index 234c547..86be072 100644 int elapsedTicks = MinecraftServer.currentTick - this.lastTick; if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks; diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java -index b808716..035db5e 100644 +index a9b8cfd..6abf6b1 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java @@ -6,6 +6,7 @@ import javax.annotation.Nullable; @@ -249,7 +249,7 @@ index 804215a..e830d83 100644 + double G(); default double getZ() { return G(); } // Paper - OBFHELPER } diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index 0d521ca..54413cd 100644 +index a651961..1f5de89 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -170,6 +170,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi diff --git a/Spigot-Server-Patches/0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch b/Spigot-Server-Patches/0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch index 3fc9aa11f..cd10c3cb9 100644 --- a/Spigot-Server-Patches/0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch +++ b/Spigot-Server-Patches/0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch @@ -1,4 +1,4 @@ -From e264dce82841fb275c6b8ad493f0575a22449fcd Mon Sep 17 00:00:00 2001 +From 526ae9f44188b65fb44cb33a9e91b72a6df818af Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 01:49:22 -0400 Subject: [PATCH] Remove the item from the correct hand when spawn egg depletes @@ -18,17 +18,17 @@ index 6092346..c1e9cbf 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 526a608..837bc25 100644 +index 526a608..c0c60a7 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1407,6 +1407,7 @@ public abstract class EntityLiving extends Entity { } } -+ public void setHeldItem(EnumHand enumhand, @Nullable ItemStack itemstack) { a(enumhand, itemstack); } // Paper // OBFHELPER ++ public void setHeldItem(EnumHand enumhand, @Nullable ItemStack itemstack) { a(enumhand, itemstack); } // Paper - OBFHELPER public void a(EnumHand enumhand, @Nullable ItemStack itemstack) { if (enumhand == EnumHand.MAIN_HAND) { this.setSlot(EnumItemSlot.MAINHAND, itemstack); -- -2.9.0 +2.9.2.windows.1