From 5eed8ed8f094dc97f63402afd7c36e0d3e4a16f1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 19 Mar 2013 16:51:45 +1100 Subject: [PATCH] Update le patches so that they may henceforth apply cleanly without errors due to the last upstream commit. --- CraftBukkit-Patches/0002-Spigot-changes.patch | 42 ++++++++++--------- .../0008-Per-world-view-distance.patch | 6 +-- .../0017-Improved-Timings-System.patch | 16 +++---- ...Optimize-getTileEntities-performance.patch | 6 +-- ...tile-entity-lookup-for-chunk-sending.patch | 6 +-- .../0030-Enable-Improved-ping-sending.patch | 10 ++--- ...ion-itself-instead-of-next-to-bed-Fi.patch | 6 +-- ...y-on-CraftPlayer.getBedSpawnLocation.patch | 6 +-- ...-3667-Faux-sleepers-wake-up-normally.patch | 6 +-- .../0038-PlayerItemDamageEvent.patch | 10 ++--- 10 files changed, 58 insertions(+), 56 deletions(-) diff --git a/CraftBukkit-Patches/0002-Spigot-changes.patch b/CraftBukkit-Patches/0002-Spigot-changes.patch index 572add63c..be4287c44 100644 --- a/CraftBukkit-Patches/0002-Spigot-changes.patch +++ b/CraftBukkit-Patches/0002-Spigot-changes.patch @@ -1,4 +1,4 @@ -From 8878e09188c2088a60503fade58f989fc7ed12c0 Mon Sep 17 00:00:00 2001 +From 3e3baa72093f845274f47c79673beccc1b081e35 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 16 Mar 2013 10:13:29 +1100 Subject: [PATCH] Spigot changes. @@ -23,7 +23,7 @@ Subject: [PATCH] Spigot changes. .../net/minecraft/server/ThreadLoginVerifier.java | 21 +++ src/main/java/net/minecraft/server/World.java | 152 ++++++++++++++++++--- .../java/net/minecraft/server/WorldServer.java | 36 ++++- - .../java/org/bukkit/craftbukkit/CraftServer.java | 45 +++--- + .../java/org/bukkit/craftbukkit/CraftServer.java | 47 ++++--- .../java/org/bukkit/craftbukkit/CraftWorld.java | 76 ++++++++++- src/main/java/org/bukkit/craftbukkit/Spigot.java | 20 +++ .../craftbukkit/chunkio/ChunkIOProvider.java | 2 +- @@ -32,7 +32,7 @@ Subject: [PATCH] Spigot changes. .../org/bukkit/craftbukkit/util/LongHashSet.java | 11 +- .../bukkit/craftbukkit/util/LongObjectHashMap.java | 5 + src/main/resources/configurations/bukkit.yml | 27 ++++ - 28 files changed, 488 insertions(+), 79 deletions(-) + 28 files changed, 488 insertions(+), 81 deletions(-) create mode 100644 src/main/java/org/bukkit/craftbukkit/Spigot.java create mode 100644 src/main/java/org/bukkit/craftbukkit/util/FlatMap.java @@ -407,10 +407,10 @@ index 13c2705..9ea4ee6 100644 } } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 585595d..224c57f 100644 +index d57ff15..a435f67 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -303,7 +303,7 @@ public abstract class PlayerList { +@@ -304,7 +304,7 @@ public abstract class PlayerList { event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s1); } else if (!this.isWhitelisted(s)) { @@ -419,7 +419,7 @@ index 585595d..224c57f 100644 } else { String s2 = socketaddress.toString(); -@@ -1044,7 +1044,13 @@ public abstract class PlayerList { +@@ -1045,7 +1045,13 @@ public abstract class PlayerList { public void r() { while (!this.players.isEmpty()) { @@ -710,7 +710,7 @@ index 9c39815..67f2560 100644 entityhuman = (EntityHuman) this.players.get(i); j = MathHelper.floor(entityhuman.locX) + this.random.nextInt(11) - 5; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ddcaaaa..c614ecc 100644 +index ce54462..05b2d6d 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1,5 +1,7 @@ @@ -721,15 +721,15 @@ index ddcaaaa..c614ecc 100644 import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; -@@ -12,6 +14,7 @@ import java.util.TreeSet; - // CraftBukkit start +@@ -13,6 +15,7 @@ import java.util.TreeSet; + import org.bukkit.WeatherType; import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.util.LongHash; +import org.bukkit.craftbukkit.util.LongObjectHashMap; import org.bukkit.event.block.BlockFormEvent; import org.bukkit.event.weather.LightningStrikeEvent; -@@ -277,15 +280,30 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -278,15 +281,30 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate } protected void g() { @@ -763,7 +763,7 @@ index ddcaaaa..c614ecc 100644 // ChunkCoordIntPair chunkcoordintpair = (ChunkCoordIntPair) iterator.next(); int k = chunkX * 16; int l = chunkZ * 16; -@@ -383,7 +401,17 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -384,7 +402,17 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate if (block != null && block.isTicking()) { ++i; @@ -783,7 +783,7 @@ index ddcaaaa..c614ecc 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3775022..8f65601 100644 +index 6b3b9fe..872c4ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -146,7 +146,7 @@ public final class CraftServer implements Server { @@ -841,7 +841,7 @@ index 3775022..8f65601 100644 try { configuration.save(getConfigFile()); } catch (IOException ex) { -@@ -526,6 +542,7 @@ public final class CraftServer implements Server { +@@ -535,6 +551,7 @@ public final class CraftServer implements Server { ((DedicatedServer) console).propertyManager = config; @@ -849,7 +849,7 @@ index 3775022..8f65601 100644 boolean animals = config.getBoolean("spawn-animals", console.getSpawnAnimals()); boolean monsters = config.getBoolean("spawn-monsters", console.worlds.get(0).difficulty > 0); int difficulty = config.getInt("difficulty", console.worlds.get(0).difficulty); -@@ -591,6 +608,7 @@ public final class CraftServer implements Server { +@@ -600,6 +617,7 @@ public final class CraftServer implements Server { "This plugin is not properly shutting down its async tasks when it is being reloaded. This may cause conflicts with the newly loaded version of the plugin" )); } @@ -857,7 +857,7 @@ index 3775022..8f65601 100644 loadPlugins(); enablePlugins(PluginLoadOrder.STARTUP); enablePlugins(PluginLoadOrder.POSTWORLD); -@@ -1039,11 +1057,8 @@ public final class CraftServer implements Server { +@@ -1054,13 +1072,8 @@ public final class CraftServer implements Server { return count; } @@ -867,10 +867,12 @@ index 3775022..8f65601 100644 - } - - public OfflinePlayer getOfflinePlayer(String name, boolean search) { +- Validate.notNull(name, "Name cannot be null"); +- OfflinePlayer result = getPlayerExact(name); String lname = name.toLowerCase(); -@@ -1051,17 +1066,7 @@ public final class CraftServer implements Server { +@@ -1068,17 +1081,7 @@ public final class CraftServer implements Server { result = offlinePlayers.get(lname); if (result == null) { @@ -889,7 +891,7 @@ index 3775022..8f65601 100644 result = new CraftOfflinePlayer(this, name); offlinePlayers.put(lname, result); } -@@ -1199,7 +1204,7 @@ public final class CraftServer implements Server { +@@ -1216,7 +1219,7 @@ public final class CraftServer implements Server { Set players = new HashSet(); for (String file : files) { @@ -898,7 +900,7 @@ index 3775022..8f65601 100644 } players.addAll(Arrays.asList(getOnlinePlayers())); -@@ -1305,7 +1310,7 @@ public final class CraftServer implements Server { +@@ -1322,7 +1325,7 @@ public final class CraftServer implements Server { public List tabCompleteCommand(Player player, String message) { List completions = null; try { @@ -1034,10 +1036,10 @@ index 48cf5ba..1d4764c 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f8dbbee..c79f352 100644 +index 70111e7..1871d3e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -212,10 +212,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -213,10 +213,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } public void kickPlayer(String message) { diff --git a/CraftBukkit-Patches/0008-Per-world-view-distance.patch b/CraftBukkit-Patches/0008-Per-world-view-distance.patch index df5e05d8d..c7f313945 100644 --- a/CraftBukkit-Patches/0008-Per-world-view-distance.patch +++ b/CraftBukkit-Patches/0008-Per-world-view-distance.patch @@ -1,4 +1,4 @@ -From 3bc5c2ebab567f4e7722acab6cb465ed1673b26e Mon Sep 17 00:00:00 2001 +From e675b284d269749d323c7018995e71807520d700 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Jan 2013 19:57:45 +1100 Subject: [PATCH] Per world view distance. @@ -10,10 +10,10 @@ Subject: [PATCH] Per world view distance. 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c614ecc..5ef5067 100644 +index 05b2d6d..9902506 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -50,7 +50,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -51,7 +51,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate // CraftBukkit end this.server = minecraftserver; this.tracker = new EntityTracker(this); diff --git a/CraftBukkit-Patches/0017-Improved-Timings-System.patch b/CraftBukkit-Patches/0017-Improved-Timings-System.patch index 46ad62aab..9213a825b 100644 --- a/CraftBukkit-Patches/0017-Improved-Timings-System.patch +++ b/CraftBukkit-Patches/0017-Improved-Timings-System.patch @@ -1,4 +1,4 @@ -From ca107d374660de533a321bbe1fb550b097cd1b03 Mon Sep 17 00:00:00 2001 +From bf102bce710e53f82e2d43cef32df65bb5887bd7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Improved Timings System @@ -76,7 +76,7 @@ index 0dc65e6..c68e9cf 100644 protected void C() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index ae180c2..89ce129 100644 +index 27b2ce2..103ab2c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -512,6 +512,7 @@ public abstract class EntityLiving extends Entity { @@ -145,7 +145,7 @@ index ae180c2..89ce129 100644 this.world.methodProfiler.b(); this.world.methodProfiler.a("looting"); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 36acefb..e8620d5 100644 +index d363643..bbad047 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -6,7 +6,6 @@ import java.security.KeyPair; @@ -226,7 +226,7 @@ index 36acefb..e8620d5 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b3ff786..6fbec1e 100644 +index 9ea4ee6..60114e6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -963,6 +963,7 @@ public class PlayerConnection extends Connection { @@ -279,7 +279,7 @@ index db3fc42..174546d 100644 private static Map b = new HashMap(); protected World world; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c398268..d1be7c3 100644 +index 53627a8..4db8a5b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -13,6 +13,7 @@ import java.util.concurrent.Callable; @@ -381,10 +381,10 @@ index c398268..d1be7c3 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2407bc6..6ade608 100644 +index 9902506..836da20 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -168,9 +168,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -169,9 +169,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate // CraftBukkit start - Only call spawner if we have players online and the world allows for mobs or animals long time = this.worldData.getTime(); if (this.getGameRules().getBoolean("doMobSpawning") && (this.allowMonsters || this.allowAnimals) && (this instanceof WorldServer && this.players.size() > 0)) { @@ -397,7 +397,7 @@ index 2407bc6..6ade608 100644 this.methodProfiler.c("chunkSource"); this.chunkProvider.unloadChunks(); int j = this.a(1.0F); -@@ -196,6 +199,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -197,6 +200,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate this.Y(); this.getWorld().processChunkGC(); // CraftBukkit diff --git a/CraftBukkit-Patches/0025-Optimize-getTileEntities-performance.patch b/CraftBukkit-Patches/0025-Optimize-getTileEntities-performance.patch index 4fac879d4..5d6b44314 100644 --- a/CraftBukkit-Patches/0025-Optimize-getTileEntities-performance.patch +++ b/CraftBukkit-Patches/0025-Optimize-getTileEntities-performance.patch @@ -1,4 +1,4 @@ -From 5a6620a7bf57025d3a2c379b23cdf2bc04451a92 Mon Sep 17 00:00:00 2001 +From 8bdcad4ea2c020e2e5aa5211f734e1695bf7712b Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 20 Feb 2013 23:07:53 -0500 Subject: [PATCH] Optimize getTileEntities performance @@ -9,10 +9,10 @@ Avoid traversing tile entities for every loaded chunk 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7c2db4c..01b9323 100644 +index 836da20..177fa94 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -657,17 +657,20 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -658,17 +658,20 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate public List getTileEntities(int i, int j, int k, int l, int i1, int j1) { ArrayList arraylist = new ArrayList(); diff --git a/CraftBukkit-Patches/0026-Improved-tile-entity-lookup-for-chunk-sending.patch b/CraftBukkit-Patches/0026-Improved-tile-entity-lookup-for-chunk-sending.patch index 23d7d53e8..c0db39f01 100644 --- a/CraftBukkit-Patches/0026-Improved-tile-entity-lookup-for-chunk-sending.patch +++ b/CraftBukkit-Patches/0026-Improved-tile-entity-lookup-for-chunk-sending.patch @@ -1,4 +1,4 @@ -From 2d728b9be20e44900ccb1854bcebaafc2af49a48 Mon Sep 17 00:00:00 2001 +From 816a0dcc3e94acb08b671715e0f29113bc2977d6 Mon Sep 17 00:00:00 2001 From: shakytom Date: Wed, 20 Feb 2013 22:34:38 -0500 Subject: [PATCH] Improved tile entity lookup for chunk sending @@ -10,10 +10,10 @@ This results in a good reduction of time spent in player ticking. 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 52fd561..b3c7790 100644 +index 03140c2..0905964 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -172,8 +172,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -173,8 +173,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting { iterator1.remove(); if (chunkcoordintpair != null && this.world.isLoaded(chunkcoordintpair.x << 4, 0, chunkcoordintpair.z << 4)) { diff --git a/CraftBukkit-Patches/0030-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0030-Enable-Improved-ping-sending.patch index 8a948539f..90c2f3226 100644 --- a/CraftBukkit-Patches/0030-Enable-Improved-ping-sending.patch +++ b/CraftBukkit-Patches/0030-Enable-Improved-ping-sending.patch @@ -1,4 +1,4 @@ -From 52d22a6258d9e5ccab14e70b6fb8470fb1a5a7a9 Mon Sep 17 00:00:00 2001 +From 7447395e42bf44b8d0e3bc90180c60059d68ede0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Feb 2013 20:45:20 +1100 Subject: [PATCH] Enable Improved ping sending @@ -10,10 +10,10 @@ Subject: [PATCH] Enable Improved ping sending 3 files changed, 18 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b3c7790..2a77c2f 100644 +index 0905964..02637a3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -50,6 +50,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -51,6 +51,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public int newLevel = 0; public int newTotalExp = 0; public boolean keepLevel = false; @@ -22,10 +22,10 @@ index b3c7790..2a77c2f 100644 public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 224c57f..ddb2f07 100644 +index a435f67..240c992 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -713,7 +713,23 @@ public abstract class PlayerList { +@@ -714,7 +714,23 @@ public abstract class PlayerList { this.sendAll(new Packet201PlayerInfo(entityplayer.name, true, entityplayer.ping)); } // CraftBukkit end */ diff --git a/CraftBukkit-Patches/0032-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch b/CraftBukkit-Patches/0032-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch index 0c4ec08cd..71f442a2d 100644 --- a/CraftBukkit-Patches/0032-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch +++ b/CraftBukkit-Patches/0032-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch @@ -1,4 +1,4 @@ -From 0f4418baaace7b3348b268403328c853326d0e39 Mon Sep 17 00:00:00 2001 +From bf63fe669bec271a0e5ae5a6287a6255f46b8568 Mon Sep 17 00:00:00 2001 From: EdGruberman Date: Fri, 22 Feb 2013 09:23:51 -0700 Subject: [PATCH] Return bed location itself instead of next to bed; Fixes @@ -9,10 +9,10 @@ Subject: [PATCH] Return bed location itself instead of next to bed; Fixes 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c79f352..8395560 100644 +index 1871d3e..2e58bf0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -619,10 +619,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -632,10 +632,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { ChunkCoordinates bed = getHandle().getBed(); if (world != null && bed != null) { diff --git a/CraftBukkit-Patches/0033-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch b/CraftBukkit-Patches/0033-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch index bc68df7e6..b19d33135 100644 --- a/CraftBukkit-Patches/0033-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch +++ b/CraftBukkit-Patches/0033-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch @@ -1,4 +1,4 @@ -From 560f69f4f3f38b65081816affd24e7976ca8e0b8 Mon Sep 17 00:00:00 2001 +From bafed8697ae6b48f23f2befd5e44bb2f9724628a Mon Sep 17 00:00:00 2001 From: EdGruberman Date: Tue, 12 Feb 2013 16:17:31 -0700 Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes @@ -9,10 +9,10 @@ Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index ddb2f07..a2510a0 100644 +index 240c992..16216e2 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -490,8 +490,15 @@ public abstract class PlayerList { +@@ -491,8 +491,15 @@ public abstract class PlayerList { boolean useTravelAgent = false; // don't use agent for custom worlds or return from THE_END if (exitWorld != null) { if ((cause == TeleportCause.END_PORTAL) && (i == 0)) { diff --git a/CraftBukkit-Patches/0036-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch b/CraftBukkit-Patches/0036-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch index 697fe0b15..bd2dc5270 100644 --- a/CraftBukkit-Patches/0036-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch +++ b/CraftBukkit-Patches/0036-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch @@ -1,4 +1,4 @@ -From bcb3872477f8ef9805fa7844d4ae7b877cd26af2 Mon Sep 17 00:00:00 2001 +From 56c3478ef0a9a2a7de8223d94b3044ff63cb98ef Mon Sep 17 00:00:00 2001 From: Yariv Livay Date: Mon, 25 Feb 2013 22:26:36 +0200 Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally @@ -8,10 +8,10 @@ Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2a77c2f..eae753d 100644 +index 02637a3..fc8797d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -422,7 +422,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -423,7 +423,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void a(boolean flag, boolean flag1, boolean flag2) { diff --git a/CraftBukkit-Patches/0038-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0038-PlayerItemDamageEvent.patch index 8be54f25c..24521beb6 100644 --- a/CraftBukkit-Patches/0038-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0038-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From a1452c17df604ca2f6e605ceb354fe1bcc1ecfc1 Mon Sep 17 00:00:00 2001 +From 64d764df1534b32be328af8a409620fe18575522 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:45:52 +1100 Subject: [PATCH] PlayerItemDamageEvent @@ -8,10 +8,10 @@ Subject: [PATCH] PlayerItemDamageEvent 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 3b3a48d..f483725 100644 +index 389558c..70d9160 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java -@@ -170,7 +170,13 @@ public final class ItemStack { +@@ -176,7 +176,13 @@ public final class ItemStack { return Item.byId[this.id].getMaxDurability(); } @@ -25,7 +25,7 @@ index 3b3a48d..f483725 100644 if (!this.g()) { return false; } else { -@@ -185,7 +191,16 @@ public final class ItemStack { +@@ -191,7 +197,16 @@ public final class ItemStack { } i -= k; @@ -43,7 +43,7 @@ index 3b3a48d..f483725 100644 return false; } } -@@ -198,7 +213,7 @@ public final class ItemStack { +@@ -204,7 +219,7 @@ public final class ItemStack { public void damage(int i, EntityLiving entityliving) { if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) { if (this.g()) {