diff options
| author | Zach Brown <[email protected]> | 2014-11-28 18:06:26 -0600 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2014-11-28 18:06:26 -0600 |
| commit | 1c49ff69f456ecfee959bb90f021081477aa5ddf (patch) | |
| tree | d10024a119fa3e0d0cde01c435464af16559596f | |
| parent | 06c1cf41abbd1c4d5b620ea1c0beaadcc50a7aa2 (diff) | |
| download | Paper-1c49ff69f456ecfee959bb90f021081477aa5ddf.tar.gz Paper-1c49ff69f456ecfee959bb90f021081477aa5ddf.zip | |
Update Spigot's Patches round 2?
The hell happened here.
:
Fix Build 2339ac14a8e
Regen the patches 89d3fcbdfaf
This new system breaks a lot :(
159 files changed, 223 insertions, 225 deletions
diff --git a/.gitignore b/.gitignore index 952f896233..c101ffb154 100644 --- a/.gitignore +++ b/.gitignore @@ -40,5 +40,3 @@ Spigot-API Spigot-Server PaperSpigot-Server PaperSpigot-API -Bukkit -CraftBukkit diff --git a/Bukkit b/Bukkit new file mode 160000 +Subproject 277baff1a14c0eb57ef723d625446698a857884 diff --git a/CraftBukkit b/CraftBukkit new file mode 160000 +Subproject 8fc4c8321883ec02a43185e494404d1ba2079d3 diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index d7edc86860..ecb612c302 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 02a078677cd7891bda112d4df03b4ae357c5e58c Mon Sep 17 00:00:00 2001 +From a648a0a8b0e53cc753bb37b9a34e7fee8600a977 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index 1f15a31e05..089e2ad12c 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From 81f756d36cafb87ed4f63e55253162111eac24c7 Mon Sep 17 00:00:00 2001 +From fef5885eb9ba89075b623d31b95da768e078aa0c Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 1 Dec 2013 15:10:48 +1100 Subject: [PATCH] mc-dev imports diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index 6df5e3ffff..45f246e7cb 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From f313b15b07c642bdd687eada899fa22f4d43d653 Mon Sep 17 00:00:00 2001 +From 4f493e30fb31c21faae3c325034835f25752e915 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -25,7 +25,7 @@ index f2a78c1..c20a2d5 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 2f21f7a..4ab7c05 100644 +index f20a040..17d24ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1323,4 +1323,14 @@ public class CraftWorld implements World { diff --git a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch index 02b6020e6d..9a966239cc 100644 --- a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch +++ b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch @@ -1,4 +1,4 @@ -From 0ec0c2a68e29d25a42c0c5c9d55d99b189df039f Mon Sep 17 00:00:00 2001 +From 930d80ace4fb089739b570ddcd2bc247281aa2b4 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 14 Apr 2014 10:38:04 +1000 Subject: [PATCH] Obfuscation Helpers @@ -6,7 +6,7 @@ Subject: [PATCH] Obfuscation Helpers Provides several friendly named methods which map to a obfuscated method. Obfuscated methods which are used frequently should be added to this file to ease with updates to new Minecraft versions. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4a39203..00e897b 100644 +index c12b192..586123c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1298,6 +1298,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0005-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch index fe05056c40..e74b51a76b 100644 --- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 246253b92d92085145293e7c5d64a20fd836f083 Mon Sep 17 00:00:00 2001 +From 281c065d2ecfa8d09a07ca862d585ef02ae2ea7c Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration diff --git a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch index 3dfae5e797..74add3bc28 100644 --- a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch +++ b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch @@ -1,4 +1,4 @@ -From 0e407f08a361f677443120db69572f7c73268167 Mon Sep 17 00:00:00 2001 +From 62ad744472fdb9885c06d58f0ef5a47652b88d50 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 11 Jun 2013 12:56:02 +1000 Subject: [PATCH] Better Chunk Tick Selection @@ -6,7 +6,7 @@ Subject: [PATCH] Better Chunk Tick Selection An optimized chunk ticking algorithm which better selects chunks around players which are active on the server. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e8c86d2..4d630b1 100644 +index 94463a4..a01da14 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -64,7 +64,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch index 2490ea0660..fe48384fca 100644 --- a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch +++ b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch @@ -1,4 +1,4 @@ -From bec392e5a87c0d036a931c482c6e13df404bbded Mon Sep 17 00:00:00 2001 +From 9a1a0d43423b68c8c3a2e36b44d4a4aa47b3b866 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 21 Jun 2013 17:17:20 +1000 Subject: [PATCH] Crop Growth Rates @@ -54,7 +54,7 @@ index 2ce2e34..d61251f 100644 CraftEventFactory.handleBlockGrowEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this, toLegacyData(data)); // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java -index 7516e21..8357fee 100644 +index fc0e540..09cdd8a 100644 --- a/src/main/java/net/minecraft/server/BlockGrass.java +++ b/src/main/java/net/minecraft/server/BlockGrass.java @@ -45,7 +45,7 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement { @@ -119,7 +119,7 @@ index ff4f576..39c0cba 100644 world.captureTreeGeneration = true; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java -index 23661a8..24e4d85 100644 +index e4c65ff..dba443a 100644 --- a/src/main/java/net/minecraft/server/BlockStem.java +++ b/src/main/java/net/minecraft/server/BlockStem.java @@ -47,7 +47,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement { diff --git a/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch b/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch index f227d5a7a2..706a99fd8e 100644 --- a/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch +++ b/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch @@ -1,4 +1,4 @@ -From 0274f34174a47601b4fececf698e65325670b3bb Mon Sep 17 00:00:00 2001 +From 6d0c5cae337957d4c1b3d8b5ff8eb01385433532 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 11 Jun 2013 12:09:45 +1000 Subject: [PATCH] More Efficient Chunk Save Queue diff --git a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch index 589c4bf7c4..feb2bc52f8 100644 --- a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From 5fbdb53b2c7e4ed1a2eebbeaeb9f4b28d34f23a8 Mon Sep 17 00:00:00 2001 +From e9147b159cf2d57870d56030b3f0a9c7f803f3fa Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 23 Mar 2013 09:46:33 +1100 Subject: [PATCH] Merge tweaks and configuration @@ -41,7 +41,7 @@ index e2c0712..7f16401 100644 } } else { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4d630b1..18f0311 100644 +index a01da14..4cd59aa 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -908,6 +908,23 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch index d215678a59..b712f276a2 100644 --- a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From 3397d600dc9d5afeb67b5979f7490b5bfce721c1 Mon Sep 17 00:00:00 2001 +From 9e5facb25e4f5cd1aefa2709f65a6b3b54f69f12 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -94,7 +94,7 @@ index 4cd59aa..a16be9b 100644 // this.entityList.addAll(collection); Iterator iterator = collection.iterator(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4ab7c05..b9032cd 100644 +index 17d24ce..a45f2a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -162,6 +162,7 @@ public class CraftWorld implements World { diff --git a/CraftBukkit-Patches/0011-View-Distance.patch b/CraftBukkit-Patches/0011-View-Distance.patch index eef3c38dfc..fc3ba63666 100644 --- a/CraftBukkit-Patches/0011-View-Distance.patch +++ b/CraftBukkit-Patches/0011-View-Distance.patch @@ -1,4 +1,4 @@ -From 84fd7cb51f698d601ac8d22e24e9baf6f04953b7 Mon Sep 17 00:00:00 2001 +From 5ade27e51b2ffa3362e42dfba15d1b40a28847a9 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance diff --git a/CraftBukkit-Patches/0012-Spigot-Timings.patch b/CraftBukkit-Patches/0012-Spigot-Timings.patch index 54769b695b..ee1860f376 100644 --- a/CraftBukkit-Patches/0012-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0012-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 0684c3cc896612daa522771c2faadafebd1c776a Mon Sep 17 00:00:00 2001 +From 0ebc78268112f256eabea7219e1bd2921fd2b3a8 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -242,7 +242,7 @@ index 0aaee5f..803b5df 100644 this.world.methodProfiler.b(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 00e897b..1cb9d38 100644 +index 586123c..ab31862 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -45,6 +45,7 @@ import joptsimple.OptionSet; @@ -367,10 +367,10 @@ index 00e897b..1cb9d38 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 9b71ffc..2a0cea5 100644 +index 9c7c2bd..47ecfdd 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1031,6 +1031,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1009,6 +1009,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList // CraftBukkit end private void handleCommand(String s) { @@ -379,7 +379,7 @@ index 9b71ffc..2a0cea5 100644 // CraftBukkit start - whole method this.c.info(this.player.getName() + " issued server command: " + s); -@@ -1040,18 +1042,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1018,18 +1020,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList this.server.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -600,7 +600,7 @@ index ff9efe9..0d23ec1 100644 public Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b9032cd..84c52d4 100644 +index a45f2a3..13f85d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -252,9 +252,11 @@ public class CraftWorld implements World { diff --git a/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch index 5828dcb041..a946273068 100644 --- a/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch +++ b/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch @@ -1,4 +1,4 @@ -From 008dfe5d5d4c87964fc09c34e6ffd46f66d33f09 Mon Sep 17 00:00:00 2001 +From bc6052de701c26b98da0e84539c029dfadd6b153 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 21 Jun 2013 17:29:54 +1000 Subject: [PATCH] Fix Mob Spawning Relative to View Distance diff --git a/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch index 4c81dc6d71..dc9fbc8775 100644 --- a/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch +++ b/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch @@ -1,11 +1,11 @@ -From 81e9b691cfb2a3c0e0df11bf2e05f041e0d7438f Mon Sep 17 00:00:00 2001 +From 0c10eb34353da6d37510534f7747584e8b45d470 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 3 Feb 2013 09:20:19 +1100 Subject: [PATCH] Handle Null Tile Entities diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3802264..a3fc086 100644 +index 5fc707f..974daf4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1303,6 +1303,13 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0015-Entity-Activation-Range.patch b/CraftBukkit-Patches/0015-Entity-Activation-Range.patch index 5fc0f1d99e..68e3800ef7 100644 --- a/CraftBukkit-Patches/0015-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0015-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 160cff443e01980c29589470d51bc54fb447148e Mon Sep 17 00:00:00 2001 +From f1ac20811c2a33c2149c56883af5fabb560fa65c Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index bb5e17d..ba1c2f2 100644 +index e2f3456..10e99d1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -89,7 +89,7 @@ public abstract class Entity implements ICommandListener { @@ -137,7 +137,7 @@ index 8357157..16400c3 100644 super(world); this.a(0.25F, 0.25F); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 8da3ddd..c4e3e9d 100644 +index 803b5df..86474de 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -83,6 +83,13 @@ public abstract class EntityLiving extends Entity { @@ -155,7 +155,7 @@ index 8da3ddd..c4e3e9d 100644 public void G() { this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a3fc086..c006526 100644 +index 974daf4..076b4fc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1243,6 +1243,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0016-Metrics.patch b/CraftBukkit-Patches/0016-Metrics.patch index 85b0e27d78..02c594a4e5 100644 --- a/CraftBukkit-Patches/0016-Metrics.patch +++ b/CraftBukkit-Patches/0016-Metrics.patch @@ -1,4 +1,4 @@ -From 73ed5ee29cb1766c1646967dffab9f104a63d1cb Mon Sep 17 00:00:00 2001 +From 74c8d363f218b601d7059aa9cbc546f9da0c0db9 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics diff --git a/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch index 11f51e5531..2223e54152 100644 --- a/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From cc4f72301e86bf997da5da7adf86ed658aed26c6 Mon Sep 17 00:00:00 2001 +From cb6f24f19cbd3a6f2a337b8228d32b749bc7216e Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 4 Mar 2013 18:45:52 +1100 Subject: [PATCH] PlayerItemDamageEvent diff --git a/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch index 2194a9b452..fbf57be206 100644 --- a/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From fab5ba1054b3144296518fdd3852e561218de1ad Mon Sep 17 00:00:00 2001 +From a2ee07d7ddf431e275dec7fb6279daf63433aeb7 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 18 Mar 2013 20:01:44 +1100 Subject: [PATCH] Prevent NPE in CraftSign diff --git a/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch index a8cba77a58..388701c5da 100644 --- a/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From e24ea35293d323a1666931db31c059e2f8775fff Mon Sep 17 00:00:00 2001 +From 5933e32258ce700258244a95c28a6e1e3f3ad89d Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges diff --git a/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch index 21521f5986..4ba7e4a151 100644 --- a/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch +++ b/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch @@ -1,4 +1,4 @@ -From 9c06e031213caf1c0463c736134f5bee4f91b1a9 Mon Sep 17 00:00:00 2001 +From fbba0bd76ebbcd4d2ba2ecafd0e91f1a040095d6 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 23 Apr 2013 11:50:27 +1000 Subject: [PATCH] Thread Naming and Tweaks diff --git a/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch index f5196d68e0..e435108000 100644 --- a/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch @@ -1,4 +1,4 @@ -From 6c17a534faf1cbea851c45f3b3ba2963c9554ba3 Mon Sep 17 00:00:00 2001 +From 75800d61cf22442d4d1bc93c1f236af83a4d4998 Mon Sep 17 00:00:00 2001 From: Antony Riley <[email protected]> Date: Wed, 27 Mar 2013 01:41:54 +0200 Subject: [PATCH] Close Unloaded Save Files diff --git a/CraftBukkit-Patches/0022-Remove-o-Option.patch b/CraftBukkit-Patches/0022-Remove-o-Option.patch index c0df484726..a99c9bcedb 100644 --- a/CraftBukkit-Patches/0022-Remove-o-Option.patch +++ b/CraftBukkit-Patches/0022-Remove-o-Option.patch @@ -1,4 +1,4 @@ -From 74aa07fb1297175eaebfd4192c8b8e2668518e2e Mon Sep 17 00:00:00 2001 +From a47d75e84a1dc350dd415a8c5db259cfa328c253 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 19 May 2013 18:29:48 +1000 Subject: [PATCH] Remove -o Option diff --git a/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch index 9499355667..c14734cb52 100644 --- a/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch +++ b/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch @@ -1,4 +1,4 @@ -From d7c816bdcb7621b4a0d16b696c01c3b248f25f8c Mon Sep 17 00:00:00 2001 +From c1f5c0814bd607378cbbefe75da2700a888106ee Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 1 Jun 2013 16:34:38 +1000 Subject: [PATCH] Recipe Deconstruction diff --git a/CraftBukkit-Patches/0024-Implement-Arrow-API.patch b/CraftBukkit-Patches/0024-Implement-Arrow-API.patch index 5d32d293c3..19b608f84a 100644 --- a/CraftBukkit-Patches/0024-Implement-Arrow-API.patch +++ b/CraftBukkit-Patches/0024-Implement-Arrow-API.patch @@ -1,4 +1,4 @@ -From fee2702652112ad10f09a9a7234fdd897ed1cc6a Mon Sep 17 00:00:00 2001 +From 8e4326ea42b4006f8f38bd9f3023560dfe9f7a55 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 2 Jun 2013 15:16:05 +1000 Subject: [PATCH] Implement Arrow API diff --git a/CraftBukkit-Patches/0025-Hopper-Customisations.patch b/CraftBukkit-Patches/0025-Hopper-Customisations.patch index aabcfb4392..a6253bc43c 100644 --- a/CraftBukkit-Patches/0025-Hopper-Customisations.patch +++ b/CraftBukkit-Patches/0025-Hopper-Customisations.patch @@ -1,4 +1,4 @@ -From 01eedb54f5e95a52f76687ef625bddea00f9f368 Mon Sep 17 00:00:00 2001 +From 6e47263580456c9da8b556515c903cbfbbdf8c88 Mon Sep 17 00:00:00 2001 From: erocs <[email protected]> Date: Sun, 8 Sep 2013 12:06:15 -0700 Subject: [PATCH] Hopper Customisations diff --git a/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch index eccb1f725c..a73d7dc74f 100644 --- a/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 83d0c4260671e7729eb482d7ce8fbe7d3b9b53e0 Mon Sep 17 00:00:00 2001 +From d0f19a283206f07de4ce8eaa985ad0a9a38d3b2f Mon Sep 17 00:00:00 2001 From: Andy Shulman <[email protected]> Date: Mon, 15 Apr 2013 20:06:37 -0500 Subject: [PATCH] Implement SpawnerSpawnEvent. diff --git a/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch index 1cf142c637..7c82c6b5a4 100644 --- a/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch +++ b/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch @@ -1,4 +1,4 @@ -From 0680e62f3ebfa2e03d9eeef5188b4b2707304028 Mon Sep 17 00:00:00 2001 +From 72b3a001f6613cdfd324897004a0c3a2ea87d95a Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 15 Jun 2013 21:34:48 +1000 Subject: [PATCH] Firework Meta Crash Fix diff --git a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch index a2844b3c89..82a692f02c 100644 --- a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch @@ -1,14 +1,14 @@ -From b3bcb677bd5bc7c5f845659b9239db32b9e293a6 Mon Sep 17 00:00:00 2001 +From b2a198ade17a9e1d3f8afdf16efd2d308a204398 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 21 Jun 2013 18:01:29 +1000 Subject: [PATCH] Allow Disabling of Command Logging diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0e4f35d..19aaf8f 100644 +index 47ecfdd..e21bed0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1034,6 +1034,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1012,6 +1012,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot // CraftBukkit start - whole method diff --git a/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch index 0dc6236e2e..cb36f9ed1a 100644 --- a/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch @@ -1,4 +1,4 @@ -From 12e15f58613b671b868f1a0e74838e4780229a41 Mon Sep 17 00:00:00 2001 +From 3219a5db66508a6996bd785c66421f7446214209 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 21 Jun 2013 18:05:54 +1000 Subject: [PATCH] Allow Disabling of Command TabComplete diff --git a/CraftBukkit-Patches/0030-Configurable-Messages.patch b/CraftBukkit-Patches/0030-Configurable-Messages.patch index 38ae915e7d..758ff64125 100644 --- a/CraftBukkit-Patches/0030-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0030-Configurable-Messages.patch @@ -1,4 +1,4 @@ -From 47b279108fd9133ea5de128653e563793275c2e1 Mon Sep 17 00:00:00 2001 +From 81b044be2a6583f986e9c9d0f08ef51a57883e66 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages diff --git a/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch index 75916380fe..dc04e30ad0 100644 --- a/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch +++ b/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch @@ -1,4 +1,4 @@ -From 88b404cb998842371744ba03f5ebd98f592f961c Mon Sep 17 00:00:00 2001 +From 0945d83063d51846a2cd6b8043c59baa3c6abff0 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 22 Jun 2013 16:12:02 +1000 Subject: [PATCH] Allow Disabling of Random Lighting Updates @@ -18,7 +18,7 @@ index c3059b6..9e9ea23 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c006526..fcb6557 100644 +index 076b4fc..9b4e05a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2009,7 +2009,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch index ed542ce61d..806cd798c9 100644 --- a/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch +++ b/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch @@ -1,4 +1,4 @@ -From 2847ce7bd37c53add794fec473be60b60224a17b Mon Sep 17 00:00:00 2001 +From db18a4785b18daf00b86c88fd4dc0d32eebb5df3 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Thu, 27 Jun 2013 17:26:09 +1000 Subject: [PATCH] Properly Close Inventories diff --git a/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch index 64e211d2d4..aed35b23c3 100644 --- a/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch +++ b/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch @@ -1,14 +1,14 @@ -From 9e733588f48678280a2209ff0b56c3d677aa9e02 Mon Sep 17 00:00:00 2001 +From c7e3163a08a3797e61608ac9fcbbdf5ebfd34ba2 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 28 Jun 2013 19:52:54 +1000 Subject: [PATCH] Disallow Interaction With Self diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3bfcd94..24dd7f0 100644 +index e21bed0..2bf9f49 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1169,6 +1169,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1147,6 +1147,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u()); WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); Entity entity = packetplayinuseentity.a((World) worldserver); diff --git a/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch index a609c36387..c7de190c30 100644 --- a/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch +++ b/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch @@ -1,4 +1,4 @@ -From 3deeab2aa8e79f1f1d45d3eb551e2ab981ee90cb Mon Sep 17 00:00:00 2001 +From 39908f7095fd34b8ce478c42808bd83747fcafcc Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 2 Jul 2013 20:32:49 +1000 Subject: [PATCH] Entity Mount and Dismount Events diff --git a/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch index 5e6512d710..e4730b778f 100644 --- a/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch +++ b/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch @@ -1,4 +1,4 @@ -From c963624b5abc0547e7c0eb224d362f23e130ac00 Mon Sep 17 00:00:00 2001 +From d2347b2bad3317dcd6774c60255af50c18ffbf49 Mon Sep 17 00:00:00 2001 From: Alex Ciuba <[email protected]> Date: Tue, 11 Jun 2013 15:23:03 -0400 Subject: [PATCH] Prevent Ghost Players Caused by Plugins diff --git a/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch index ab288c85fc..c839315eee 100644 --- a/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch +++ b/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch @@ -1,4 +1,4 @@ -From e6efbdee7fa312e978fc1cb5eedfd3568eb5684f Mon Sep 17 00:00:00 2001 +From cb4abf0876742f68cb52fa57d0f05eef21de148f Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 3 Aug 2013 19:02:59 +1000 Subject: [PATCH] Plug World Unload Memory Leak diff --git a/CraftBukkit-Patches/0037-Player-Collision-API.patch b/CraftBukkit-Patches/0037-Player-Collision-API.patch index c2650c1d50..139b415ee2 100644 --- a/CraftBukkit-Patches/0037-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0037-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From 1416d961e1445f05084e49af2b1e7c64b293761f Mon Sep 17 00:00:00 2001 +From 34960664e3295fc6a2dde8148d5984d185fda497 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 3 Aug 2013 19:27:07 +1000 Subject: [PATCH] Player Collision API diff --git a/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch index 96deb02a92..b93ed92c4d 100644 --- a/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch +++ b/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch @@ -1,11 +1,11 @@ -From 7cbfd8567af8064f01aba1ff03ce9b581d46226f Mon Sep 17 00:00:00 2001 +From 900e9db269b400872ce1388c48c21879deeb0ebf Mon Sep 17 00:00:00 2001 From: agentk20 <[email protected]> Date: Sat, 3 Aug 2013 19:28:48 +1000 Subject: [PATCH] Fully Disable Snooper When Not Required diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1cb9d38..a227340 100644 +index ab31862..1d67c07 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -627,11 +627,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch index 3febea3d6c..f90626e70f 100644 --- a/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch +++ b/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch @@ -1,4 +1,4 @@ -From d55e61ec721eaca35a88a0ff4fd900288beebe76 Mon Sep 17 00:00:00 2001 +From 680b66ad471af5c09814c9c3495f6eb10e779fad Mon Sep 17 00:00:00 2001 From: DerFlash <[email protected]> Date: Sat, 3 Aug 2013 19:53:48 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch index 161a25cd9b..cdf8d3fb2b 100644 --- a/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch +++ b/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch @@ -1,4 +1,4 @@ -From 3c4614e2e411ef1ffcb250b7c2dfde392fd0f340 Mon Sep 17 00:00:00 2001 +From caacb61f2c1776f5d877fff024bab374ddf178f0 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 5 Aug 2013 20:17:20 +1000 Subject: [PATCH] Cap Minimum Player Speed diff --git a/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch index a978866758..90294df1e2 100644 --- a/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch +++ b/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch @@ -1,4 +1,4 @@ -From bccecea300f4b3dc11024365a81ce16978dd240e Mon Sep 17 00:00:00 2001 +From e410f14442e2f20e4e6e8e0359a3fb4a22389c0e Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 14 Sep 2013 10:16:38 +1000 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent diff --git a/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch index 1fa6cfd4bd..1ca1d95e44 100644 --- a/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch +++ b/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch @@ -1,4 +1,4 @@ -From 8a3ecfb1768bc58ad25261d4ff1922989d3d1c2f Mon Sep 17 00:00:00 2001 +From 278e9ad5469a08b0ad4b7a5b023361c7f7fad92d Mon Sep 17 00:00:00 2001 From: BlackHole <[email protected]> Date: Tue, 16 Jul 2013 22:34:50 +0200 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT diff --git a/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch index a9a3cadbdf..5fa0508374 100644 --- a/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch +++ b/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch @@ -1,4 +1,4 @@ -From 42a42f6ec9d5ad895bf66a398ac9de97f6a25d45 Mon Sep 17 00:00:00 2001 +From 55d876c1cefd9c7fe8b7959d7af94435bfd60fd6 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 21 Sep 2013 12:33:09 +1000 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving diff --git a/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch index 7648921f66..f48e3c522f 100644 --- a/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From f6fe4b96cae27d007b322988f85dc7c3876c5a25 Mon Sep 17 00:00:00 2001 +From 97da24a6e7b5d85dbd82820807708f1962e68b2f Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 22 Sep 2013 19:10:53 +1000 Subject: [PATCH] Item Despawn Rate diff --git a/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch index 00fa8b9651..5a3ea82d40 100644 --- a/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch +++ b/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch @@ -1,11 +1,11 @@ -From f27c8faa6a5a02f356acebca0f5c178265c79fef Mon Sep 17 00:00:00 2001 +From 206178759589ab1942cda1d8aa21a3336f1fd7b8 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 6 Oct 2013 17:36:28 +1100 Subject: [PATCH] Don't Special Case X Move Value diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b903a81..310ab0c 100644 +index 2bf9f49..6ffce8f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -108,6 +108,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -14,9 +14,9 @@ index b903a81..310ab0c 100644 private boolean justTeleported = false; + private boolean hasMoved; // Spigot - // For the PacketPlayOutBlockPlace hack :( - Long lastPacket; -@@ -214,6 +215,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList + public CraftPlayer getPlayer() { + return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity(); +@@ -208,6 +209,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } // CraftBukkit start - fire PlayerMoveEvent Player player = this.getPlayer(); @@ -35,7 +35,7 @@ index b903a81..310ab0c 100644 Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location. Location to = player.getLocation().clone(); // Start off the To location as the Players current location. -@@ -242,7 +255,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -236,7 +249,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList this.lastPitch = to.getPitch(); // Skip the first time we do this diff --git a/CraftBukkit-Patches/0046-Implement-respawn-API.patch b/CraftBukkit-Patches/0046-Implement-respawn-API.patch index f9e88fd558..0dba6ae68b 100644 --- a/CraftBukkit-Patches/0046-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0046-Implement-respawn-API.patch @@ -1,4 +1,4 @@ -From c45455632dc675c3f43ba0f0b811e9479ddc9c40 Mon Sep 17 00:00:00 2001 +From ed784d4bf689c5e60c333806b8b63bf4334160d3 Mon Sep 17 00:00:00 2001 From: ninja- <[email protected]> Date: Tue, 8 Oct 2013 14:34:49 +0200 Subject: [PATCH] Implement respawn API. diff --git a/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch index b19f236716..e5177a11cb 100644 --- a/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From ac8b907b3f05c7f88346f5ed2d0fdbe0ab281d12 Mon Sep 17 00:00:00 2001 +From 14530ddad995a1001d4434971234b7a8ea765823 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 14 Oct 2013 19:20:10 +1100 Subject: [PATCH] Arrow Despawn Rate diff --git a/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch b/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch index e75c00aeaf..892721e11a 100644 --- a/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch +++ b/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch @@ -1,4 +1,4 @@ -From 99ee83952a261f744f8c689615e28c49e5853cbf Mon Sep 17 00:00:00 2001 +From 6d6b5bcad06ca34d88abaa9cbeee95158d5925c6 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 1 Dec 2013 17:52:14 +1100 Subject: [PATCH] Fix packed ice generation diff --git a/CraftBukkit-Patches/0049-Watchdog-Thread.patch b/CraftBukkit-Patches/0049-Watchdog-Thread.patch index 36beb9c88c..d6c610be24 100644 --- a/CraftBukkit-Patches/0049-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0049-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From d4ad0adea49e54a330c38b8e44c10b9ce8fa1234 Mon Sep 17 00:00:00 2001 +From d4b5d31d08c0240e5ce5e8104c84e377e872efbb Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 5 Aug 2014 17:20:19 +0100 Subject: [PATCH] Watchdog Thread. @@ -18,7 +18,7 @@ index 390c6eb..240c909 100644 thread.setName("Server Watchdog"); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a227340..c5a6bec 100644 +index 1d67c07..65c3a66 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -537,6 +537,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch b/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch index f23f63c79b..da19fd2322 100644 --- a/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch +++ b/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch @@ -1,4 +1,4 @@ -From c58440804a708a12053e7d0938f6bd85f7bf4c10 Mon Sep 17 00:00:00 2001 +From b3c989b0fb4d2fcdbf2f331c38e56ef1ce2e133f Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 3 Dec 2013 11:07:48 +1100 Subject: [PATCH] Clear Flower Pot on Drop diff --git a/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch index ddc771b3f6..693ffb2ac4 100644 --- a/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch +++ b/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch @@ -1,4 +1,4 @@ -From 0fa249558b94c997140a25a1236626c9e22f7340 Mon Sep 17 00:00:00 2001 +From 6e90d5453c0852c00ea47ba024d83ceb728f8aa4 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Mon, 2 Dec 2013 23:42:09 +0000 Subject: [PATCH] Fix some chunks not being sent to the client diff --git a/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch index 76552de911..7c97d66484 100644 --- a/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch +++ b/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch @@ -1,4 +1,4 @@ -From 21fba8d7f5b9b5384f1168dd7d9bb4276de80c81 Mon Sep 17 00:00:00 2001 +From 5b8767e1d3aacd236a1e081e450ee69c3391de28 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Thu, 5 Dec 2013 13:55:53 +1100 Subject: [PATCH] Fix Broken Async Chat diff --git a/CraftBukkit-Patches/0053-Orebfuscator.patch b/CraftBukkit-Patches/0053-Orebfuscator.patch index d6bee79c71..6a7071ef3c 100644 --- a/CraftBukkit-Patches/0053-Orebfuscator.patch +++ b/CraftBukkit-Patches/0053-Orebfuscator.patch @@ -1,4 +1,4 @@ -From 75e2457256bf4e36cc2ce32af9a8b188bcf5d182 Mon Sep 17 00:00:00 2001 +From 65eae3b8ffa2e0ee6f4242b90aa2df6fc8b24721 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator @@ -79,7 +79,7 @@ index 8af5e1f..9df0d53 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 3e24620..f0d915f 100644 +index e6145ac..34c22d2 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -197,6 +197,7 @@ public class PlayerInteractManager { @@ -91,7 +91,7 @@ index 3e24620..f0d915f 100644 public void a(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index fcb6557..e0a7160 100644 +index 9b4e05a..045defc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -445,6 +445,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch index 56e021737f..03b1d6f599 100644 --- a/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch +++ b/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch @@ -1,4 +1,4 @@ -From af655ad8d3d0b4676e5ab4f6cd78c4f6e2f6bf6d Mon Sep 17 00:00:00 2001 +From f1803422eba940c40a526653484f681e7f380846 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 13 Dec 2013 11:45:47 +1100 Subject: [PATCH] Optimize DataWatcher diff --git a/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch index 4ee8209499..75f072ddd4 100644 --- a/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch +++ b/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch @@ -1,4 +1,4 @@ -From f86f19addeaf624be20e4bae0627444810221fee Mon Sep 17 00:00:00 2001 +From 1fed60fae44318412d1b5b37820c7b6a38814d10 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Wed, 18 Dec 2013 13:32:10 +1100 Subject: [PATCH] Fire PreLogin Events in Offline Mode diff --git a/CraftBukkit-Patches/0056-BungeeCord-Support.patch b/CraftBukkit-Patches/0056-BungeeCord-Support.patch index 6507868c26..d2546b4f24 100644 --- a/CraftBukkit-Patches/0056-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0056-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From ee8fda0b3febdea34a3d61d004269bdf7e718d15 Mon Sep 17 00:00:00 2001 +From be18153c2049202699a2659ed4891f40ede9f117 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support diff --git a/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch index 47f003007b..885503f952 100644 --- a/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch +++ b/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch @@ -1,4 +1,4 @@ -From 3f1a783d85a5c607779bfabcb092a2d4fdf207a7 Mon Sep 17 00:00:00 2001 +From 2745cb1ef3ac96e96fc5147043cd587c5143aac3 Mon Sep 17 00:00:00 2001 From: Dylan Xaldin <[email protected]> Date: Thu, 12 Dec 2013 18:05:03 -0600 Subject: [PATCH] Allow Disabling Zombie Villager Aggression diff --git a/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch index c5823418f2..d7087fd037 100644 --- a/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch @@ -1,4 +1,4 @@ -From c017a37c50c0b7924730665019c8916b39acc055 Mon Sep 17 00:00:00 2001 +From 6ba534764c69a6f193cb1fce8af5d6e13a0f6b1e Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 13 Dec 2013 11:58:58 +1100 Subject: [PATCH] Configurable Amount of Netty Threads @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c5a6bec..471e6d1 100644 +index 65c3a66..79f0fdb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -61,7 +61,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch index ef201747b9..f8f67a03c8 100644 --- a/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch +++ b/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch @@ -1,4 +1,4 @@ -From e58a21889e5c6a0ba5ab15714d0d3c045827496f Mon Sep 17 00:00:00 2001 +From acccbf3a5331907ed855cafc8fba8b6ce8e995e7 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 13 Dec 2013 15:21:02 +1100 Subject: [PATCH] Prevent Mineshaft Saving diff --git a/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch index 497475fba5..3a00b95de1 100644 --- a/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch +++ b/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch @@ -1,11 +1,11 @@ -From 3300cd586685815d7a61e813efc6357f972e4ec4 Mon Sep 17 00:00:00 2001 +From cfaf51175deab8cb8606e574dbd5515b28dc55c8 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Wed, 18 Dec 2013 13:39:14 +1100 Subject: [PATCH] Log Cause of Unexpected Exceptions diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 471e6d1..bd79bea 100644 +index 79f0fdb..0d2682d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -518,6 +518,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0061-Particle-API.patch b/CraftBukkit-Patches/0061-Particle-API.patch index 837e572219..4703a6cd8b 100644 --- a/CraftBukkit-Patches/0061-Particle-API.patch +++ b/CraftBukkit-Patches/0061-Particle-API.patch @@ -1,4 +1,4 @@ -From 46651bf2dc09eff03441027909a51561b2e6a1be Mon Sep 17 00:00:00 2001 +From 2ab992704cc79f958e0f794be42191c004ecbed9 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -18,7 +18,7 @@ index 7de0de5..7eca388 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 84c52d4..260aece 100644 +index 13f85d5..e395704 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -811,28 +811,18 @@ public class CraftWorld implements World { diff --git a/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch index c9af5bced4..0dc22f8e17 100644 --- a/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch +++ b/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch @@ -1,4 +1,4 @@ -From f643aa65e716444ff37db596870b58f9d5d41efe Mon Sep 17 00:00:00 2001 +From 8cd4d276b754d7b0967c9e00cb1bcb29ab60a8c0 Mon Sep 17 00:00:00 2001 From: DerFlash <[email protected]> Date: Tue, 9 Jul 2013 00:11:12 +0200 Subject: [PATCH] Save ticks lived to nbttag diff --git a/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch index e1db6cd40a..fe53f62ac2 100644 --- a/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch +++ b/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch @@ -1,11 +1,11 @@ -From 5d158e48d9e66e2b9342d9459591075864e45196 Mon Sep 17 00:00:00 2001 +From 7156eb1dd517f94b6411650424fc37e4bd394d9b Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 11 Jun 2013 12:17:37 +1000 Subject: [PATCH] More Efficient GetCubes diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e0a7160..69e0e78 100644 +index 045defc..a35ec3f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1037,33 +1037,60 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch index 166ccda5dd..8367accbaf 100644 --- a/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch +++ b/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch @@ -1,4 +1,4 @@ -From f636b5da615846f11fff67c168a28a5ef34a6b9a Mon Sep 17 00:00:00 2001 +From 3b6a6cd4f4eb99f3788c780cd02e47c7a4eed45c Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 2 Feb 2014 16:55:46 +0000 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's diff --git a/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch index 1fc279c48c..079981690d 100644 --- a/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch +++ b/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch @@ -1,4 +1,4 @@ -From ba3cb8a97f86170714630163965e420dd7e3dee9 Mon Sep 17 00:00:00 2001 +From 423d560676e360967616e27a0699bb2a1ac123a6 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 23 Dec 2013 14:07:41 +1100 Subject: [PATCH] Warn if PermGen may be insufficient diff --git a/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch index f66febdd16..f15718e2e4 100644 --- a/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch @@ -1,4 +1,4 @@ -From 3492d9f210df06c7fcfa72c04ada822eed1972e5 Mon Sep 17 00:00:00 2001 +From b0fb0d01c45d1489f6b10fda2fe987ec822cb115 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 23 Dec 2013 15:57:57 +1100 Subject: [PATCH] Disable Connected Check on setScoreboard diff --git a/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch index bb311ba0f3..148dfaea92 100644 --- a/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch +++ b/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch @@ -1,4 +1,4 @@ -From 9178c98cc3278727839867387c8b3feebe8e4295 Mon Sep 17 00:00:00 2001 +From 7a91f20d04ef923de42b623bab99e54f921820bd Mon Sep 17 00:00:00 2001 From: slide23 <[email protected]> Date: Fri, 20 Dec 2013 20:15:33 -0600 Subject: [PATCH] Add Late Bind Option diff --git a/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch index 20d9114c7f..540e633a20 100644 --- a/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch @@ -1,4 +1,4 @@ -From ec81ebb55338e6e7de1dfad123a28235c8926adf Mon Sep 17 00:00:00 2001 +From 704d165c8f08c6ab3028c3f4721a49ae652d7f24 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Tue, 7 Jan 2014 15:56:26 +0000 Subject: [PATCH] Allow statistics to be disabled/forced diff --git a/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch index a794d044d1..26df855693 100644 --- a/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch +++ b/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch @@ -1,4 +1,4 @@ -From 5ca384fbadcd22850b93749fdac40df57fd75b54 Mon Sep 17 00:00:00 2001 +From 59f1349abaf58fc3075438f33491036bd9f86dc8 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 10 Jan 2014 15:15:50 +1100 Subject: [PATCH] Fix ItemStack Unbreakable Code diff --git a/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch index e3bc7b727d..6361fa47b4 100644 --- a/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch +++ b/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch @@ -1,11 +1,11 @@ -From 4a3318d2891f8a8b28fc9dae6714ab0495291016 Mon Sep 17 00:00:00 2001 +From 49b0c41fc7fde1660d06dbb04f5b0278935f9b92 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 12 Jan 2014 20:56:41 +1100 Subject: [PATCH] Try and Debug Crash Reports Crashing diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bd79bea..b686a49 100644 +index 0d2682d..e82c297 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -717,7 +717,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0071-Replace-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0071-Replace-AutoSave-Mechanism.patch index c7e33c4382..7870df37bc 100644 --- a/CraftBukkit-Patches/0071-Replace-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0071-Replace-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From 2a40e42c5a2306b047bc3b6d913aac81f51210a2 Mon Sep 17 00:00:00 2001 +From dd974038e5345b2a5eeea4c73328db406d16abe0 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Replace AutoSave Mechanism @@ -6,7 +6,7 @@ Subject: [PATCH] Replace AutoSave Mechanism The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b686a49..5c7a9c6 100644 +index e82c297..83e73a4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -625,7 +625,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch b/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch index accfc2da25..ecb42a1970 100644 --- a/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch +++ b/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch @@ -1,4 +1,4 @@ -From d5275a1b06907c466dfc778a7f0f216d2e0a7254 Mon Sep 17 00:00:00 2001 +From 0b32283b5dd3214150ac86dbb4e5c07e93a57c8b Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Sat, 18 Jan 2014 14:27:03 +0000 Subject: [PATCH] Support vanilla's direction tag on fireballs diff --git a/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch b/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch index 7f4600c4e5..f84ba9ed10 100644 --- a/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch +++ b/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch @@ -1,11 +1,11 @@ -From e59ebaf9c574922bc89e5a7edc25e32a5515af63 Mon Sep 17 00:00:00 2001 +From 11d7d1221554e9a1dc18f9ef598608fa90e972b8 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Sat, 18 Jan 2014 19:32:42 +0000 Subject: [PATCH] Support non-prefixed URLs diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java -index b7b9c81..42f074b 100644 +index 844bf6a..0481688 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java @@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableMap.Builder; diff --git a/CraftBukkit-Patches/0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch index 603ea3550c..2e81435d67 100644 --- a/CraftBukkit-Patches/0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch +++ b/CraftBukkit-Patches/0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch @@ -1,4 +1,4 @@ -From 7516ef8151a06ceb3384927015bed5197eda10ed Mon Sep 17 00:00:00 2001 +From 06bbb81efa37499c608feaa4911d006a27c07eaf Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 20 Jan 2014 13:44:07 +1100 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays. diff --git a/CraftBukkit-Patches/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index 60a121fbbe..c388850a8e 100644 --- a/CraftBukkit-Patches/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,4 +1,4 @@ -From ce7f8fb7367be24f48b4c73d53a0b816baeb1db2 Mon Sep 17 00:00:00 2001 +From 511f7cb92f5fedc1e1f3b652da47e7aee95e7c7f Mon Sep 17 00:00:00 2001 From: Dmck2b <[email protected]> Date: Mon, 20 Jan 2014 20:18:23 +0000 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks diff --git a/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch index 831c2006fd..de8f94cab1 100644 --- a/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch @@ -1,11 +1,11 @@ -From 4deaf7e75e99e1038f7a93d09274226dacf52fcc Mon Sep 17 00:00:00 2001 +From 3dd34878baf715348c1253f0c29229b7e6fb5cd1 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 25 Jan 2014 14:08:35 +1100 Subject: [PATCH] Highly Optimized Tick Loop diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5c7a9c6..7749d9f 100644 +index 83e73a4..36fdaf7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -118,6 +118,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0077-Add-Spigot-Links.patch b/CraftBukkit-Patches/0077-Add-Spigot-Links.patch index 9751bb750f..e29534592c 100644 --- a/CraftBukkit-Patches/0077-Add-Spigot-Links.patch +++ b/CraftBukkit-Patches/0077-Add-Spigot-Links.patch @@ -1,4 +1,4 @@ -From 2757957ab4f50400475cbd19145b9b6fd40a974e Mon Sep 17 00:00:00 2001 +From 504ed1e4c77c1c7f64e8ecaccdac7fb2233a47c4 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Thu, 23 Jan 2014 13:17:35 +1100 Subject: [PATCH] Add Spigot Links @@ -35,7 +35,7 @@ index cda766b..1f12a75 100644 + * *Note*: this is not needed as the repository we use has Spigot-API too, but you might have a newer one (with your own changes :D) * Check out this repo and: `mvn clean package` diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 129ac34..751bbfc 100644 +index a6c1178..6b7ad05 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -6,11 +6,10 @@ diff --git a/CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch index 5535a60e42..3d82041bcb 100644 --- a/CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From c11f7939c995beea9ecbae1ed4c4dba437e31474 Mon Sep 17 00:00:00 2001 +From d8949d3fc0f3f931dc7f9d1bd878c6207621575c Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 26 Jan 2014 21:48:34 +1100 Subject: [PATCH] Configurable Ping Sample Size diff --git a/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch index 442a74bdff..fe34e49540 100644 --- a/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 0fff2861e9df1d5ab914b98475c98e8ac12e6de1 Mon Sep 17 00:00:00 2001 +From 4a300e8267e9bffccbd8070e05cfeb69de810358 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 27 Jan 2014 08:39:26 +1100 Subject: [PATCH] Add Optional Tick Shuffling diff --git a/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch index 5e0c790aec..4450e9f500 100644 --- a/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch @@ -1,11 +1,11 @@ -From bc1a7637538a13c614c833c079e2cbf296231994 Mon Sep 17 00:00:00 2001 +From 741a5657bb224d4284d47f2c7c57a62697746406 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 28 Jan 2014 20:35:35 +1100 Subject: [PATCH] Allow Configuring Chunks per Packet diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4e0db00..6665502 100644 +index 3bc77ae..5578300 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -220,7 +220,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch index 76f582357e..07d88425c9 100644 --- a/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From 513e8be75d433d8efcb799148b4ced24e5a933fc Mon Sep 17 00:00:00 2001 +From 26840bbaeb380ec51927a9643f2642320d2d5c2e Mon Sep 17 00:00:00 2001 From: Smove <[email protected]> Date: Sat, 1 Feb 2014 18:12:16 +1100 Subject: [PATCH] Implement Locale Getter for Players diff --git a/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch index c09dc64054..22208b786e 100644 --- a/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 228ece2e9442e9f318bbfc5fc33262d1f0192f3a Mon Sep 17 00:00:00 2001 +From a0f1bc858a82f34ab796cb4302afdd4ce181e1c7 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Fri, 31 Jan 2014 11:18:34 -0500 Subject: [PATCH] Cap Entity Collisions diff --git a/CraftBukkit-Patches/0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index 75cec0de5f..202c64bc38 100644 --- a/CraftBukkit-Patches/0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch +++ b/CraftBukkit-Patches/0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch @@ -1,4 +1,4 @@ -From 0abdde40f3c86120fdece2f96f4abee4b5e283de Mon Sep 17 00:00:00 2001 +From 16bd2064ad68aa5561e0f6e4840af0eafb698955 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Thu, 6 Feb 2014 21:59:20 +0000 Subject: [PATCH] Fix dispensing bone meal not having the correct data value diff --git a/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch index c24d1049a3..7d6d04e283 100644 --- a/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch @@ -1,14 +1,14 @@ -From faa2df863c36e6606e4aed1cd60e379bc85e9832 Mon Sep 17 00:00:00 2001 +From 44c738d328190c1e42e7b1d5a701a389934704a9 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 8 Feb 2014 08:13:40 +0000 Subject: [PATCH] Spam Filter Exclusions diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 310ab0c..393831b 100644 +index 6ffce8f..064b4c6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -940,9 +940,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -918,9 +918,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false); } diff --git a/CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch index 1157c2be5f..a25985f823 100644 --- a/CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From ff04acbb4f541280b03153bddcb4bae9b9ca00bb Mon Sep 17 00:00:00 2001 +From 94f26cdbde92dbf7d2d0587208bcdcd85ac33e9a Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 9 Feb 2014 14:39:01 +1100 Subject: [PATCH] Add Option to Silence CommandBlock Console diff --git a/CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch index a054a2d327..41fddb7237 100644 --- a/CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From 3d4c9a1f3677f920489c6ca6d2c44d614127846d Mon Sep 17 00:00:00 2001 +From b4c8e78b1fc5c81957f42f22ed3622817bc6e7e4 Mon Sep 17 00:00:00 2001 From: Tux <[email protected]> Date: Sun, 9 Feb 2014 14:03:03 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch index b4e7ab593a..429f367573 100644 --- a/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch @@ -1,14 +1,14 @@ -From 5313d1395974a2023bbb576effcbd669df0c77d0 Mon Sep 17 00:00:00 2001 +From b0afa4907c4edd212821d34e57f4165875c95532 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Wed, 12 Feb 2014 18:18:01 +1100 Subject: [PATCH] Allow Disabling Creative Item Filter diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 393831b..54fba6d 100644 +index 064b4c6..da185c1 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1664,7 +1664,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1642,7 +1642,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize(); // CraftBukkit - Add invalidItems check diff --git a/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch index ab3334d0e6..2642e815d7 100644 --- a/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch @@ -1,4 +1,4 @@ -From bedff1820ef18d59fee61734f72d99c05f8c93b5 Mon Sep 17 00:00:00 2001 +From 86719075f68287a5c5ddeb0482c6bc96ed06f6c1 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Wed, 12 Feb 2014 20:02:58 +1100 Subject: [PATCH] Cap Channel Registrations diff --git a/CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index db9f2b967b..094fd51fe4 100644 --- a/CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,4 +1,4 @@ -From c51b2f9d4cbae39ba2f25d49b663cabc184b6f95 Mon Sep 17 00:00:00 2001 +From eaf88de580420442d6a126d77a927140b7765cca Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Wed, 12 Feb 2014 20:44:14 +0000 Subject: [PATCH] Allow vanilla commands to be the main version of a command diff --git a/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch index 58d37368eb..49f6030bc7 100644 --- a/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From 69fb81ace8ff782f6dd7038b9a9a7487121881d4 Mon Sep 17 00:00:00 2001 +From ea7cdc3104db651903e099f2a012cd2005e6ec90 Mon Sep 17 00:00:00 2001 From: hcherndon <[email protected]> Date: Sat, 15 Feb 2014 01:51:20 -0600 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. @@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.) diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 237ff57..ce3f04d 100644 +index da185c1..92607c6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2021,7 +2021,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1999,7 +1999,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } // CraftBukkit start - Add "isDisconnected" method diff --git a/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch index 796c686817..a976121644 100644 --- a/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 56976846cfa4a3138592077288f3592572a50b08 Mon Sep 17 00:00:00 2001 +From c5c47eb99e11506b4829c1c76e132b6268d8d80a Mon Sep 17 00:00:00 2001 From: drXor <[email protected]> Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -39,7 +39,7 @@ index 5bda5d3..1bbce9b 100644 //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); float pitch = 0.8F + this.random.nextFloat() * 0.2F; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 260aece..19c606e 100644 +index e395704..50fdfcd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1385,6 +1385,22 @@ public class CraftWorld implements World { diff --git a/CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch index 87dfd0ed0f..f6bbc6b378 100644 --- a/CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From 5a6071e6f1967baad96fe370e5497a1bcac43ac9 Mon Sep 17 00:00:00 2001 +From 88d4630955659bc4cf65d8853014f7422a360b98 Mon Sep 17 00:00:00 2001 From: FrozenBrain <[email protected]> Date: Sun, 2 Mar 2014 21:13:46 +0100 Subject: [PATCH] Use one PermissibleBase for all Command Blocks diff --git a/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch index ab2b44e205..ed20ad58be 100644 --- a/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 4e6040427ecb0cf9ab498d403e6d731972310a22 Mon Sep 17 00:00:00 2001 +From ed0834d044f738e2e879bb96bd4cc9b67e7dc3c4 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Wed, 5 Mar 2014 20:27:27 +0000 Subject: [PATCH] Prevent hoppers from loading chunks diff --git a/CraftBukkit-Patches/0094-Guard-Entity-List.patch b/CraftBukkit-Patches/0094-Guard-Entity-List.patch index 6932927434..5946ee731d 100644 --- a/CraftBukkit-Patches/0094-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0094-Guard-Entity-List.patch @@ -1,4 +1,4 @@ -From 37911f5c7eacd81e8c81158a396fe8f6f154ada9 Mon Sep 17 00:00:00 2001 +From 4d78db78eea3b9c0ad686d1283f5a1c7586c972f Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 10 Mar 2014 09:03:28 +1100 Subject: [PATCH] Guard Entity List diff --git a/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch index 4782b1e6a4..d901655340 100644 --- a/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From 6a4a46f7eaa9666f3ac0bcd72ddffab97d43ae48 Mon Sep 17 00:00:00 2001 +From 2317d87940f106c27011d4246d99e6e074d15acd Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Tue, 14 Jan 2014 20:11:25 +0000 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 59a2c58..763ea9d 100644 +index 703b919..d525845 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1031,6 +1031,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch index 0fb0485ff6..889eb130b7 100644 --- a/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From b90a8671d89d40f9d99598465225b1efdfc43d63 Mon Sep 17 00:00:00 2001 +From e21ce8917903200e7db168d5169544aed2543428 Mon Sep 17 00:00:00 2001 From: drXor <[email protected]> Date: Tue, 25 Feb 2014 15:15:26 -0400 Subject: [PATCH] Cancellable WitherSkull potion effect diff --git a/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch index 7bb52cbf2b..b49ab2bb99 100644 --- a/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,11 +1,11 @@ -From 43257f49aed689a59e7d09a4f64f7dc7220a4848 Mon Sep 17 00:00:00 2001 +From a0923006217408d7fb8141f8a6c54838f2c09206 Mon Sep 17 00:00:00 2001 From: drXor <[email protected]> Date: Sat, 15 Mar 2014 01:30:05 -0400 Subject: [PATCH] Descriptive kick reasons instead of Nope! diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8c7ec1d..f5a204d 100644 +index d6c8be8..b0a90d7 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -207,7 +207,7 @@ public abstract class Entity implements ICommandListener { @@ -27,10 +27,10 @@ index 8c7ec1d..f5a204d 100644 f1 = 0; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c95471c..fab3a4e 100644 +index 92607c6..05ca762 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -191,7 +191,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -185,7 +185,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList // CraftBukkit start - Check for NaN if (Double.isNaN(packetplayinflying.x) || Double.isNaN(packetplayinflying.y) || Double.isNaN(packetplayinflying.z)) { c.warn(player.getName() + " was caught trying to crash the server with an invalid position."); @@ -39,7 +39,7 @@ index c95471c..fab3a4e 100644 return; } // CraftBukkit end -@@ -863,7 +863,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -841,7 +841,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList this.player.z(); } else { PlayerConnection.c.warn(this.player.getName() + " tried to set an invalid carried item"); diff --git a/CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch index 98aed9b92b..18ec122989 100644 --- a/CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 55611483f28cccdf49a6bf95094d697d47020f0b Mon Sep 17 00:00:00 2001 +From a64dab11f262b2ce8ac1a0b9a954e0c3dc2be203 Mon Sep 17 00:00:00 2001 From: drXor <[email protected]> Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds diff --git a/CraftBukkit-Patches/0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index 6014bf398d..b533131ce6 100644 --- a/CraftBukkit-Patches/0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From 6f6b223300fb88e340b47798a34d3c9ba75307ea Mon Sep 17 00:00:00 2001 +From c7fdf3cf5386848e7d91111a6c42ca3af8fae66d Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Fri, 11 Apr 2014 11:16:34 +0100 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang diff --git a/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch index 6e603600d2..fb20df3ab6 100644 --- a/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch @@ -1,4 +1,4 @@ -From ff10a02d2f664890316780aefc6520a6e2f92fb7 Mon Sep 17 00:00:00 2001 +From 9aee92bedd7bcf8daca7311b051ac11c1bd2540e Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 12 Apr 2014 21:23:58 +1000 Subject: [PATCH] Treat Bungee as Online Mode diff --git a/CraftBukkit-Patches/0101-Add-Conversion-Message.patch b/CraftBukkit-Patches/0101-Add-Conversion-Message.patch index 51508f9083..bec3c8c5a9 100644 --- a/CraftBukkit-Patches/0101-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0101-Add-Conversion-Message.patch @@ -1,4 +1,4 @@ -From 8332685a8facc80964331f1c52a0fe9b16d8ac47 Mon Sep 17 00:00:00 2001 +From e0545b7da70438cd421c20697b968c954f6992c9 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sat, 12 Apr 2014 23:30:44 +1000 Subject: [PATCH] Add Conversion Message diff --git a/CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch index 558398b397..77f078dd84 100644 --- a/CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch +++ b/CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch @@ -1,4 +1,4 @@ -From 587db9330f1c1e66d94b156e62a0cd8b7a7f803b Mon Sep 17 00:00:00 2001 +From 66804a6e49e24829b418c31d6c30b73cd8e9387d Mon Sep 17 00:00:00 2001 From: "[email protected]" <[email protected]> Date: Mon, 10 Feb 2014 10:05:11 -0500 Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396 diff --git a/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch index 55fde35738..49fdae298a 100644 --- a/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch @@ -1,4 +1,4 @@ -From b444f12d518544ceb1c3255b5270c93a0d38c85b Mon Sep 17 00:00:00 2001 +From d4cd4cb74299d5e40c0d640211c7438ff86f4dc6 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 13 Apr 2014 09:00:59 +1000 Subject: [PATCH] Print Stack on InternalException diff --git a/CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch index 85081ba663..f79b897117 100644 --- a/CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From 3d56405cbfce415bc673eac3e1b857381e3f5597 Mon Sep 17 00:00:00 2001 +From e98d6b717bef858004359c11e2229d0566989723 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 13 Apr 2014 14:41:23 +1000 Subject: [PATCH] Use Offline Player Data Once if Required. diff --git a/CraftBukkit-Patches/0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index 7a9339fd04..ca86e0caf8 100644 --- a/CraftBukkit-Patches/0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch +++ b/CraftBukkit-Patches/0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch @@ -1,4 +1,4 @@ -From 651006abcab13c8db6294b1936c319a1de892f11 Mon Sep 17 00:00:00 2001 +From d6dee24611d41dbcc93c2a673f90c981801eccdf Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 14 Apr 2014 09:46:20 +1000 Subject: [PATCH] Use Provided Case for Non Existent Offline Players diff --git a/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch index dcc035309a..0f0bdb3aad 100644 --- a/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch @@ -1,4 +1,4 @@ -From cd752d58e05020f044eb515dda5a6b2a10420e0f Mon Sep 17 00:00:00 2001 +From 732a1afd9cf2c7b64d21ac6e8cf35df904514406 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 14 Apr 2014 17:21:24 +1000 Subject: [PATCH] Check for blank OfflinePlayer Names diff --git a/CraftBukkit-Patches/0107-Fix-Player-Banning.patch b/CraftBukkit-Patches/0107-Fix-Player-Banning.patch index 85d0de85c1..9a78fb7ce7 100644 --- a/CraftBukkit-Patches/0107-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0107-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From 48893047d057daf4146813db0af4c8bb67cccb75 Mon Sep 17 00:00:00 2001 +From 9a200c666d5d193362482ad0714a8645bacb009b Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 15 Apr 2014 10:32:48 +1000 Subject: [PATCH] Fix Player Banning diff --git a/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch index 260588c053..fe0ade9649 100644 --- a/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From 19813149ba27b60a1ab4a2a459d4f2d7d5d02126 Mon Sep 17 00:00:00 2001 +From ff439435253866b248e5d70d85e8a884bb13a729 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Wed, 16 Apr 2014 10:09:56 +1000 Subject: [PATCH] Fix ban expire dates. diff --git a/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch index a99c2514fc..eafe19168e 100644 --- a/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch @@ -1,4 +1,4 @@ -From 211fb6e77d91f4731f2bc4ccb0a548fd60c7adf8 Mon Sep 17 00:00:00 2001 +From d4bab1cf318029a9209c3a1df183376041355eae Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Wed, 16 Apr 2014 11:14:38 +1000 Subject: [PATCH] Correct Ban Expiration diff --git a/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch index 70f2db245a..7494450f23 100644 --- a/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch @@ -1,4 +1,4 @@ -From a6ff065f1b511ac3c4af5e6b87e069671024aa6a Mon Sep 17 00:00:00 2001 +From dbaaa91dec68aed24f7c5e7e4fd1b287c835e338 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Wed, 16 Apr 2014 01:40:30 -0400 Subject: [PATCH] Convert Horses owner to UUID diff --git a/CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch index 5f3f7818d3..3ea5c39cc8 100644 --- a/CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch +++ b/CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch @@ -1,4 +1,4 @@ -From df4e9d4de428744c6d4813512e5e1b784ddc7231 Mon Sep 17 00:00:00 2001 +From 2242016186aa31ccb94795774da6c3b5e69ff05d Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Thu, 17 Apr 2014 19:22:22 +1000 Subject: [PATCH] Expand team API to allow arbitrary strings. diff --git a/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch index 68411365f7..8cda0f8a76 100644 --- a/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From 6cd095c137af6266b2cb60b03d75a5c6bad9adf8 Mon Sep 17 00:00:00 2001 +From f169f48d58863f32f7e4236646171e26cec4eec3 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Thu, 17 Apr 2014 19:35:53 +1000 Subject: [PATCH] Add Score.isScoreSet()Z API. diff --git a/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch index cfb30ede1f..784eab2d4c 100644 --- a/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch @@ -1,4 +1,4 @@ -From a55984409e30e7da590cf2e1a53fcbba4588074b Mon Sep 17 00:00:00 2001 +From dae8da7506be2433d14e08eaa23eeae9e8d10183 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 20 Apr 2014 11:16:54 +1000 Subject: [PATCH] Log null TileEntity Owner diff --git a/CraftBukkit-Patches/0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch index 6f1f3afbea..2406bc7761 100644 --- a/CraftBukkit-Patches/0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch +++ b/CraftBukkit-Patches/0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch @@ -1,4 +1,4 @@ -From 7031cf8ff9e86f028c5f3bd6d9911ed290a46491 Mon Sep 17 00:00:00 2001 +From 0cb0d751070a587847560335508c8c0275d5e823 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 20 Apr 2014 18:58:00 +1000 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs. diff --git a/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch index 4abe1e52fd..4ad7af2a69 100644 --- a/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From 2a1bd36f7c149628b85b6fb2e9e3954183cc6c22 Mon Sep 17 00:00:00 2001 +From eb16ed4408643a996d1f6915b4a29dd78da6f35e Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Sun, 20 Apr 2014 13:18:55 +0100 Subject: [PATCH] Convert player skulls async diff --git a/CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index 557eed5255..5a7d1d2224 100644 --- a/CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,4 +1,4 @@ -From f1584ab1932c38af97d243a0ee2f9ec3cb57db32 Mon Sep 17 00:00:00 2001 +From 440adcc546b800e60752817752901c510b81ff1b Mon Sep 17 00:00:00 2001 From: David <[email protected]> Date: Mon, 21 Apr 2014 12:43:08 +0100 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash diff --git a/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch index e9c54329b6..82af1ecdaf 100644 --- a/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch @@ -1,4 +1,4 @@ -From 4ab9e517242a81a3b7e6c4d6e473586b64798ef0 Mon Sep 17 00:00:00 2001 +From ad60e0a03eed48a34949230c3338e09129786003 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 15 Apr 2014 10:48:35 +1000 Subject: [PATCH] Check Skull canPlace diff --git a/CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch b/CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch index 289956ff87..14940c109f 100644 --- a/CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch +++ b/CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch @@ -1,4 +1,4 @@ -From 7892209204e55e33e095667978ad2537387a7ab2 Mon Sep 17 00:00:00 2001 +From b2b3c0115c12da106161b8f7c143bc77c2388430 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Mon, 20 Jan 2014 20:42:28 +0000 Subject: [PATCH] Don't let trees replace any block. diff --git a/CraftBukkit-Patches/0119-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0119-Fix-race-condition-that-could-kill-connections-befor.patch index 89b0a77270..537874d4ca 100644 --- a/CraftBukkit-Patches/0119-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0119-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From 1e92c6509e0e9d5ecb2e7aa2f19617a12ec57a89 Mon Sep 17 00:00:00 2001 +From 539a8728f06d465151bf0bdf833c6d3d8e3839aa Mon Sep 17 00:00:00 2001 From: Jonas Konrad <[email protected]> Date: Fri, 25 Apr 2014 23:46:46 +0200 Subject: [PATCH] Fix race condition that could kill connections before they diff --git a/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch index 3fdcd90cdc..b6861eac32 100644 --- a/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch @@ -1,4 +1,4 @@ -From 187a5144128bba37d75c79f0167430ad60daefeb Mon Sep 17 00:00:00 2001 +From 3aa41a8b9df8054e481316c0e17e51f19a2c983c Mon Sep 17 00:00:00 2001 From: drXor <[email protected]> Date: Fri, 25 Apr 2014 18:17:30 -0400 Subject: [PATCH] Configurable UserCache cap diff --git a/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch index 95f25ce23d..ff1931f5d6 100644 --- a/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From e29720f25bab51a25058725b7f0f30f34a1d0fa7 Mon Sep 17 00:00:00 2001 +From 57153fb375acd95b5a4ef6c5c88c12dffa783b26 Mon Sep 17 00:00:00 2001 From: ninja <[email protected]> Date: Tue, 8 Apr 2014 14:05:19 +0200 Subject: [PATCH] Implement PlayerSpawnLocationEvent. diff --git a/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch index fec2f8d040..15ae10a6c2 100644 --- a/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From 1677b5fe5a8148b445d67addaa3fe06a8125d307 Mon Sep 17 00:00:00 2001 +From 4fee8bb37ebd62f42653a776f40a471733f70441 Mon Sep 17 00:00:00 2001 From: hauno <[email protected]> Date: Tue, 6 May 2014 18:01:37 -0700 Subject: [PATCH] Cap Objective Score Length diff --git a/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch index 3a792027e1..660f9d311e 100644 --- a/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch +++ b/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch @@ -1,4 +1,4 @@ -From efcae0ea82f494d81f9f307481d0f80e89248576 Mon Sep 17 00:00:00 2001 +From e84429abbde66bfd8e9c05963d399d3d324f374e Mon Sep 17 00:00:00 2001 From: riking <[email protected]> Date: Wed, 14 May 2014 13:46:48 -0700 Subject: [PATCH] Process conversation input on the main thread. Fixes @@ -6,10 +6,10 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f100076..7d1a1a9 100644 +index 05ca762..8c688ab 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -925,7 +925,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -903,7 +903,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } else if (s.isEmpty()) { c.warn(this.player.getName() + " tried to send an empty message"); } else if (getPlayer().isConversing()) { diff --git a/CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch index c15741466a..9e938dc8fe 100644 --- a/CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,4 +1,4 @@ -From 1463e9101902bc0ae222eaa38f5520cf6fe64e6d Mon Sep 17 00:00:00 2001 +From 34be0c8f0d948a3f13ee36ce5fc6eb0cfd2478ba Mon Sep 17 00:00:00 2001 From: drXor <[email protected]> Date: Fri, 23 May 2014 18:05:10 -0400 Subject: [PATCH] Configurable save-on-stop-only for UserCache diff --git a/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch index f75e5be39f..2346ec8cf6 100644 --- a/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch +++ b/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch @@ -1,4 +1,4 @@ -From a1c304d35d21c963d6e0af8e8fcf81d2e21dfe74 Mon Sep 17 00:00:00 2001 +From 7f584e654ad7782fdf6d8030337fb49da685f155 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 20 Jun 2014 19:40:00 +1000 Subject: [PATCH] Prevent Unbounded IntCache Growth diff --git a/CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch index d63081b6e0..cd1c6a53e5 100644 --- a/CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch +++ b/CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch @@ -1,4 +1,4 @@ -From 53a832abd832282aeb012b6f1415e06101219bfc Mon Sep 17 00:00:00 2001 +From d685c04fccc5fe9ca2cc5f305d4ac6be1d0cc9ff Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Thu, 26 Jun 2014 23:42:52 +0100 Subject: [PATCH] Add damager to the unhandled error diff --git a/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch index 51da0394e5..2025f7fdc3 100644 --- a/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch +++ b/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch @@ -1,4 +1,4 @@ -From 92032898faf2c92ba9bd4172815ae3a0394d2cdf Mon Sep 17 00:00:00 2001 +From 7556d8e24e4855b01682d52b35d9870be72fbe81 Mon Sep 17 00:00:00 2001 From: Andrew Krieger <[email protected]> Date: Tue, 24 Dec 2013 07:55:23 -0800 Subject: [PATCH] Cross World Entity Teleportation diff --git a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch index 7b8d3a2ffe..190b4fb3fa 100644 --- a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch @@ -1,14 +1,14 @@ -From 6652d07bcd30b9459e23d686c0c4d2cc04ae5a4c Mon Sep 17 00:00:00 2001 +From 40146e37ae633b5a6fadd738428bb3690c595597 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Sun, 29 Jun 2014 21:10:34 +0100 Subject: [PATCH] Limit block placement/interaction packets diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7d1a1a9..5c71b5d 100644 +index 8c688ab..a42c293 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -621,9 +621,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -615,9 +615,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList // CraftBukkit end } @@ -31,7 +31,7 @@ index 7d1a1a9..5c71b5d 100644 // CraftBukkit start if (this.player.dead) return; -@@ -663,10 +676,14 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -641,10 +654,14 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList // CraftBukkit start int itemstackAmount = itemstack.count; @@ -46,7 +46,7 @@ index 7d1a1a9..5c71b5d 100644 // CraftBukkit - notch decrements the counter by 1 in the above method with food, // snowballs and so forth, but he does it in a place that doesn't cause the -@@ -692,7 +709,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -670,7 +687,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } if (this.checkMovement && this.player.e((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && !this.minecraftServer.a(worldserver, blockposition, this.player) && worldserver.af().a(blockposition)) { diff --git a/CraftBukkit-Patches/0129-Better-item-validation.patch b/CraftBukkit-Patches/0129-Better-item-validation.patch index b61997a300..a90a57f017 100644 --- a/CraftBukkit-Patches/0129-Better-item-validation.patch +++ b/CraftBukkit-Patches/0129-Better-item-validation.patch @@ -1,4 +1,4 @@ -From b8b26fc29e5aa514a8e5986dba2bd809424d67cb Mon Sep 17 00:00:00 2001 +From c7dd65e14069ae6f27bafad69f405a36f2884ae1 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Wed, 2 Jul 2014 23:35:51 +0100 Subject: [PATCH] Better item validation diff --git a/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch index b05556fac5..84a98bb42f 100644 --- a/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From ea4d6da1f8cc62b3f906849b558ddf6e543253a4 Mon Sep 17 00:00:00 2001 +From 47869e25635908f6004c17c68537e0eb0e6e1647 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 4 Jul 2014 13:28:45 +1000 Subject: [PATCH] Further Seed Customisation diff --git a/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch index c906d3404e..2e4da45801 100644 --- a/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch +++ b/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch @@ -1,4 +1,4 @@ -From e5c6a31967f7fe53fb805eb3b15d35dcf69d2de5 Mon Sep 17 00:00:00 2001 +From 30f32bbcead087106aabc4058ff2cbf1b8f42198 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 8 Jul 2014 09:01:50 +1000 Subject: [PATCH] Disable ResourceLeakDetector diff --git a/CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch index df78f9c9d3..487b666cbc 100644 --- a/CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch +++ b/CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch @@ -1,4 +1,4 @@ -From ee84e35a34635073821681a872a0c682ed16d8ac Mon Sep 17 00:00:00 2001 +From ec634c18d2d410e766b9390aada8c9833287bea7 Mon Sep 17 00:00:00 2001 From: Suddenly <[email protected]> Date: Sat, 5 Jul 2014 16:56:44 +0100 Subject: [PATCH] Add More Information to session.lock Errors diff --git a/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch index 3f7c93871c..253c8745a0 100644 --- a/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch +++ b/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch @@ -1,4 +1,4 @@ -From 59a9427226a9623432dfd92ea0cf7273e5beb2c2 Mon Sep 17 00:00:00 2001 +From c568c3fd814c8e3d9d6474e8b8078815061163df Mon Sep 17 00:00:00 2001 From: Suddenly <[email protected]> Date: Tue, 8 Jul 2014 09:44:18 +1000 Subject: [PATCH] Safer JSON Loading diff --git a/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch index f263d98632..d728fd87e5 100644 --- a/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch +++ b/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch @@ -1,4 +1,4 @@ -From 32c93e286834918ddb5277838a61aba5aa092f5e Mon Sep 17 00:00:00 2001 +From 968e4acf5e3659602178d7db38b5bd350624bb87 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Tue, 8 Jul 2014 20:27:52 +1000 Subject: [PATCH] Fix Slow "Loading Libraries" diff --git a/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch index 6667cec19d..5a8b226f42 100644 --- a/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch +++ b/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch @@ -1,4 +1,4 @@ -From 71bb568a74fc8d0eb13e3d8cb51dc53ab5d6da4c Mon Sep 17 00:00:00 2001 +From 249022760700b094d2115bcd87d1c324c5d01087 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Wed, 9 Jul 2014 10:35:44 +1000 Subject: [PATCH] Add CommandLine EULA Flag diff --git a/CraftBukkit-Patches/0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch index 9dfcd460dc..16d15cc5b9 100644 --- a/CraftBukkit-Patches/0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch +++ b/CraftBukkit-Patches/0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch @@ -1,4 +1,4 @@ -From 4a220fe89e54e214aae790044acc43470f50e452 Mon Sep 17 00:00:00 2001 +From f3af473302872e73efb30b5803d17c20467a2105 Mon Sep 17 00:00:00 2001 From: drXor <[email protected]> Date: Thu, 17 Jul 2014 21:13:15 -0400 Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked diff --git a/src/main/java/net/minecraft/server/ContainerEnchantTable.java b/src/main/java/net/minecraft/server/ContainerEnchantTable.java -index 7938983..8b3a0e6 100644 +index 51cee69..ef8d05c 100644 --- a/src/main/java/net/minecraft/server/ContainerEnchantTable.java +++ b/src/main/java/net/minecraft/server/ContainerEnchantTable.java @@ -311,7 +311,11 @@ public class ContainerEnchantTable extends Container { diff --git a/CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index 83060c608c..0f43b669d8 100644 --- a/CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From e5c1ec8f79b8656fb5d055fa3bddd83f9110443f Mon Sep 17 00:00:00 2001 +From 39d3162e43feed7bc3f9de13c2578d1b6f4748a2 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Sat, 19 Jul 2014 12:49:48 +0100 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots diff --git a/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch index ba7554fe0d..d1d80ee089 100644 --- a/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch @@ -1,4 +1,4 @@ -From 82207506f2e55fe35c4a416b8cc970bc2690c8a3 Mon Sep 17 00:00:00 2001 +From e71e8c43c18abafed4cc6b2d436f6ca31837335b Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Sat, 19 Jul 2014 19:54:41 +0100 Subject: [PATCH] Prevent a crash involving attributes diff --git a/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch index 1fbc4f9f2c..c8199d99e6 100644 --- a/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch @@ -1,14 +1,14 @@ -From a9c4fa7d4061258d818ac02f6474535f963d6451 Mon Sep 17 00:00:00 2001 +From eb56d9b59833f21b4446ee2c4b4052d639e79871 Mon Sep 17 00:00:00 2001 From: Jonas Konrad <[email protected]> Date: Fri, 4 Jul 2014 23:03:13 +0200 Subject: [PATCH] Make "moved wrongly" limit configurable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5c71b5d..44ec70d 100644 +index a42c293..6697282 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -411,7 +411,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -405,7 +405,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList d17 = d11 * d11 + d12 * d12 + d13 * d13; boolean flag1 = false; diff --git a/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch index 3e5688372a..646c768cd2 100644 --- a/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch @@ -1,4 +1,4 @@ -From 168f7a3f93e3692a7b18d5626048051418f141a2 Mon Sep 17 00:00:00 2001 +From 7e342d18c29d913aab4965fddb7ad0a556b65e56 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" <[email protected]> Date: Thu, 26 Jun 2014 18:37:29 -0400 Subject: [PATCH] Fix Null Tile Entity Worlds diff --git a/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch index c837d557f2..a8519ec8f2 100644 --- a/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch @@ -1,14 +1,14 @@ -From e31fe51a2bf30cec67cd6c0b5a0e2b3347679644 Mon Sep 17 00:00:00 2001 +From 4c9a281b6ca396b32d40f35ba1d6c765bc584496 Mon Sep 17 00:00:00 2001 From: Jonas Konrad <[email protected]> Date: Tue, 22 Jul 2014 15:59:01 +0200 Subject: [PATCH] Make "moved too quickly" limit configurable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 44ec70d..2bfa289 100644 +index 6697282..a8dae62 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -384,7 +384,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -378,7 +378,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList // CraftBukkit end double d17 = d14 * d14 + d15 * d15 + d16 * d16; diff --git a/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch b/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch index 892ce94c55..070f87de09 100644 --- a/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch +++ b/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch @@ -1,4 +1,4 @@ -From c9c4e4ee3d6001e4e4978dd4bbb3ab2b0822d192 Mon Sep 17 00:00:00 2001 +From b4c70c83ead24b304d8894ae495a287c0c155411 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" <[email protected]> Date: Sat, 19 Apr 2014 16:58:26 -0400 Subject: [PATCH] Alternative Hopper Ticking diff --git a/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch index c2e8b4a170..98a4abc4f6 100644 --- a/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch @@ -1,4 +1,4 @@ -From 6ec7cbafe22bff847aad8ef87f0fbfb7c47218dd Mon Sep 17 00:00:00 2001 +From a93fc618f95f538d1d45bff747f95430afca3e64 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Sun, 27 Jul 2014 20:46:04 +1000 Subject: [PATCH] Apply NBTReadLimiter to more things. diff --git a/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch index 61c8e4ff98..37d509d5ca 100644 --- a/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From 6c29fdc8911a5ec3c82f30560bb44af977bdb5aa Mon Sep 17 00:00:00 2001 +From b41de7a21ea34e6070b87428879a0352ceb7fa7c Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Mon, 28 Jul 2014 16:55:51 +1000 Subject: [PATCH] Allow Attribute Capping. diff --git a/CraftBukkit-Patches/0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch b/CraftBukkit-Patches/0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch index f9efeed031..2b948d7570 100644 --- a/CraftBukkit-Patches/0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch +++ b/CraftBukkit-Patches/0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch @@ -1,4 +1,4 @@ -From 243c5dd2689250db2ab7c7762c90ff3d78497e02 Mon Sep 17 00:00:00 2001 +From 092bf9fb992a2fbba6a139a69341d5a2bab6280d Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Mon, 28 Jul 2014 11:42:11 +0100 Subject: [PATCH] Add an option for a global cache for any request on Mojang's diff --git a/CraftBukkit-Patches/0146-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0146-Only-fetch-an-online-UUID-in-online-mode.patch index 9624fead6e..1c1507d7a6 100644 --- a/CraftBukkit-Patches/0146-Only-fetch-an-online-UUID-in-online-mode.patch +++ b/CraftBukkit-Patches/0146-Only-fetch-an-online-UUID-in-online-mode.patch @@ -1,4 +1,4 @@ -From e4a37b934d0e6817ded953ab337589b3ec249840 Mon Sep 17 00:00:00 2001 +From 0a24088a6bdd4efb63c8ea55646bbc34d6b2a8f2 Mon Sep 17 00:00:00 2001 From: Maxim Van de Wynckel <[email protected]> Date: Wed, 30 Jul 2014 01:19:51 +0200 Subject: [PATCH] Only fetch an online UUID in online mode diff --git a/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch index a99a6db5c4..1c9478e066 100644 --- a/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From 7d73eeac30fe632ade1575f2aa1b080ed731d944 Mon Sep 17 00:00:00 2001 +From 9ea8f5bcd53963fb38bf3c1cf30a713290cee4c0 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Thu, 31 Jul 2014 17:48:20 +0100 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go diff --git a/CraftBukkit-Patches/0148-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch b/CraftBukkit-Patches/0148-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch index 4715d63a71..e4fdd8fdcd 100644 --- a/CraftBukkit-Patches/0148-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch +++ b/CraftBukkit-Patches/0148-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch @@ -1,14 +1,14 @@ -From ce645b7b1daef5b2231977f374ce979af3890224 Mon Sep 17 00:00:00 2001 +From ef3e7100e4a816f0e79814abf732468d6cf4a843 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Thu, 7 Aug 2014 15:48:33 +0100 Subject: [PATCH] Fix LEFT_CLICK_AIR detection when not in creative diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2bfa289..521e9bc 100644 +index a8dae62..18b9e9b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1136,7 +1136,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1114,7 +1114,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList float f6 = MathHelper.sin(-f1 * 0.017453292F); float f7 = f4 * f5; float f8 = f3 * f5; diff --git a/CraftBukkit-Patches/0149-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0149-Plug-WorldMap-Memory-Leak.patch index 9c3eff63f1..ea8be28c6c 100644 --- a/CraftBukkit-Patches/0149-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0149-Plug-WorldMap-Memory-Leak.patch @@ -1,4 +1,4 @@ -From 5ebd47227a150a986648e400a4e5a62b34b2002d Mon Sep 17 00:00:00 2001 +From 977a44a9aa4f3a3a4ad6515956396313030432a4 Mon Sep 17 00:00:00 2001 From: md_5 <[email protected]> Date: Fri, 8 Aug 2014 19:57:03 +1000 Subject: [PATCH] Plug WorldMap Memory Leak diff --git a/CraftBukkit-Patches/0150-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0150-Fix-Corrupted-Trapped-Chest.patch index 167d5a77a2..4528004d4b 100644 --- a/CraftBukkit-Patches/0150-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0150-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From 1238f3c8a0c4c65e984817c012fcc3e7be8c8267 Mon Sep 17 00:00:00 2001 +From 2485a965b0b0b74235684c13ab37f88a2434ce5a Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Fri, 15 Aug 2014 00:56:41 -0400 Subject: [PATCH] Fix Corrupted Trapped Chest diff --git a/CraftBukkit-Patches/0151-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0151-Remove-uneeded-validation.patch index 57fbbdc6f9..69403151be 100644 --- a/CraftBukkit-Patches/0151-Remove-uneeded-validation.patch +++ b/CraftBukkit-Patches/0151-Remove-uneeded-validation.patch @@ -1,4 +1,4 @@ -From 1ff138a853bb1c90b4cd7662b4a0992cd4028e57 Mon Sep 17 00:00:00 2001 +From 3bc8ab9a6d7f6039bc8d0286f26173db8ac61e37 Mon Sep 17 00:00:00 2001 From: drXor <[email protected]> Date: Fri, 15 Aug 2014 18:11:09 -0400 Subject: [PATCH] Remove uneeded validation diff --git a/CraftBukkit-Patches/0152-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0152-Add-Hunger-Config-Values.patch index 711c4031f4..67dac8c767 100644 --- a/CraftBukkit-Patches/0152-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0152-Add-Hunger-Config-Values.patch @@ -1,4 +1,4 @@ -From 975fe0899319dc4ae0c48d2af8873f7154b4e21b Mon Sep 17 00:00:00 2001 +From 6edefc6bb043ba50b10b472bdceebb8a22bb51eb Mon Sep 17 00:00:00 2001 From: lazertester <[email protected]> Date: Sun, 17 Aug 2014 19:56:17 +1000 Subject: [PATCH] Add Hunger Config Values diff --git a/CraftBukkit-Patches/0153-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0153-Make-debug-logging-togglable.patch index 2407d2d599..5c0a7a44cb 100644 --- a/CraftBukkit-Patches/0153-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0153-Make-debug-logging-togglable.patch @@ -1,4 +1,4 @@ -From 0b06e1bd0bdc7889c5a52391b410b338d3e44e9f Mon Sep 17 00:00:00 2001 +From b8c9fc054e16dabf159291ac77d25bdbe1fb31fb Mon Sep 17 00:00:00 2001 From: Minecrell <[email protected]> Date: Sun, 17 Aug 2014 12:42:53 +0200 Subject: [PATCH] Make debug logging togglable. diff --git a/CraftBukkit-Patches/0154-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0154-Skip-invalid-enchants-in-CraftMetaItem.patch index 0c9993cd90..97df02fa91 100644 --- a/CraftBukkit-Patches/0154-Skip-invalid-enchants-in-CraftMetaItem.patch +++ b/CraftBukkit-Patches/0154-Skip-invalid-enchants-in-CraftMetaItem.patch @@ -1,4 +1,4 @@ -From 7aa8aaa72e272ade9dd6f0a6b26cfe3e04981b5d Mon Sep 17 00:00:00 2001 +From 99213dbb8e21c6bec4f96b7989baf07ca83d792e Mon Sep 17 00:00:00 2001 From: Thinkofdeath <[email protected]> Date: Tue, 19 Aug 2014 11:04:21 +0100 Subject: [PATCH] Skip invalid enchants in CraftMetaItem diff --git a/CraftBukkit-Patches/0155-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0155-Limit-TNT-Detonations-per-tick.patch index b46fc34c75..51c73fcb94 100644 --- a/CraftBukkit-Patches/0155-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0155-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From faaf603741ea8bdaa2a4b18872cea8ef7f327a8a Mon Sep 17 00:00:00 2001 +From 4c30e618eeaaca1ef05bca3071e7504dc1377717 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Wed, 20 Aug 2014 18:12:32 -0400 Subject: [PATCH] Limit TNT Detonations per tick diff --git a/Spigot-Server-Patches/0017-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0017-Toggle-for-player-interact-limiter.patch index f7414db7fa..77e95831db 100644 --- a/Spigot-Server-Patches/0017-Toggle-for-player-interact-limiter.patch +++ b/Spigot-Server-Patches/0017-Toggle-for-player-interact-limiter.patch @@ -1,14 +1,14 @@ -From 7609e57fb0d059d23984709ec44f6711f0d229b9 Mon Sep 17 00:00:00 2001 +From fb8e42b3b2eab22ce99e5208c1b1ec379f3c0ffb Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Fri, 28 Nov 2014 01:33:25 -0600 Subject: [PATCH] Toggle for player interact limiter diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 521e9bc..da81869 100644 +index 18b9e9b..789d838 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -631,7 +631,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -625,7 +625,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u()); WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); boolean throttled = false; |