diff --git a/CraftBukkit-Patches/0004-Allow-undead-horse-types-to-be-leashed.patch b/CraftBukkit-Patches/0003-Allow-undead-horse-types-to-be-leashed.patch similarity index 100% rename from CraftBukkit-Patches/0004-Allow-undead-horse-types-to-be-leashed.patch rename to CraftBukkit-Patches/0003-Allow-undead-horse-types-to-be-leashed.patch diff --git a/CraftBukkit-Patches/0003-Prevent-null-hopper-owners-crashing-the-server.patch b/CraftBukkit-Patches/0003-Prevent-null-hopper-owners-crashing-the-server.patch deleted file mode 100644 index 3dff6aa683..0000000000 --- a/CraftBukkit-Patches/0003-Prevent-null-hopper-owners-crashing-the-server.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Suddenly -Date: Tue, 27 May 2014 14:00:41 +0100 -Subject: [PATCH] Prevent null hopper owners crashing the server - - -diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/TileEntityHopper.java -+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java -@@ -0,0 +0,0 @@ public class TileEntityHopper extends TileEntity implements IHopper { - if (!this.j() && BlockHopper.c(this.p())) { - boolean flag = false; - -- if (!this.k()) { -- flag = this.x(); -+ try { // PaperSpigot Start (Try/catch to prevent null owner crash) -+ if (!this.k()) { -+ flag = this.x(); -+ } -+ } catch (NullPointerException e) { -+ this.getWorld().setAir(this.x, this.y, this.z); -+ org.bukkit.Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Null owner found for hopper, removing hopper at {0} {1}, {2}, {3}", new Object[]{this.getWorld().getWorld().getName(), this.x, this.y, this.z}); - } - -- if (!this.l()) { -- flag = suckInItems(this) || flag; -- } -+ try { -+ if (!this.l()) { -+ flag = suckInItems(this) || flag; -+ } -+ } catch (NullPointerException e) { -+ this.getWorld().setAir(this.x, this.y, this.z); -+ org.bukkit.Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Null owner found for hopper, removing hopper at {0} {1}, {2}, {3}", new Object[]{this.getWorld().getWorld().getName(), this.x, this.y, this.z}); -+ } // PaperSpigot End - - if (flag) { - this.c(world.spigotConfig.hopperTransfer); // Spigot --- \ No newline at end of file diff --git a/CraftBukkit-Patches/0005-Teleport-passenger-vehicle-with-player.patch b/CraftBukkit-Patches/0004-Teleport-passenger-vehicle-with-player.patch similarity index 100% rename from CraftBukkit-Patches/0005-Teleport-passenger-vehicle-with-player.patch rename to CraftBukkit-Patches/0004-Teleport-passenger-vehicle-with-player.patch diff --git a/CraftBukkit-Patches/0006-Invisible-players-don-t-have-rights.patch b/CraftBukkit-Patches/0005-Invisible-players-don-t-have-rights.patch similarity index 100% rename from CraftBukkit-Patches/0006-Invisible-players-don-t-have-rights.patch rename to CraftBukkit-Patches/0005-Invisible-players-don-t-have-rights.patch diff --git a/CraftBukkit-Patches/0007-Configurable-squid-spawn-ranges.patch b/CraftBukkit-Patches/0006-Configurable-squid-spawn-ranges.patch similarity index 100% rename from CraftBukkit-Patches/0007-Configurable-squid-spawn-ranges.patch rename to CraftBukkit-Patches/0006-Configurable-squid-spawn-ranges.patch diff --git a/CraftBukkit-Patches/0008-Configurable-damage-multiplier-for-PvP-blocking.patch b/CraftBukkit-Patches/0007-Configurable-damage-multiplier-for-PvP-blocking.patch similarity index 100% rename from CraftBukkit-Patches/0008-Configurable-damage-multiplier-for-PvP-blocking.patch rename to CraftBukkit-Patches/0007-Configurable-damage-multiplier-for-PvP-blocking.patch diff --git a/CraftBukkit-Patches/0009-Configurable-cactus-and-reed-natural-growth-heights.patch b/CraftBukkit-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch similarity index 100% rename from CraftBukkit-Patches/0009-Configurable-cactus-and-reed-natural-growth-heights.patch rename to CraftBukkit-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch diff --git a/CraftBukkit-Patches/0010-Configurable-baby-zombie-movement-speed.patch b/CraftBukkit-Patches/0009-Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from CraftBukkit-Patches/0010-Configurable-baby-zombie-movement-speed.patch rename to CraftBukkit-Patches/0009-Configurable-baby-zombie-movement-speed.patch diff --git a/CraftBukkit-Patches/0011-Make-destroyed-boats-drop-the-boat-item.patch b/CraftBukkit-Patches/0010-Make-destroyed-boats-drop-the-boat-item.patch similarity index 100% rename from CraftBukkit-Patches/0011-Make-destroyed-boats-drop-the-boat-item.patch rename to CraftBukkit-Patches/0010-Make-destroyed-boats-drop-the-boat-item.patch diff --git a/CraftBukkit-Patches/0012-Inverted-Daylight-Detector-Toggle.patch b/CraftBukkit-Patches/0011-Inverted-Daylight-Detector-Toggle.patch similarity index 100% rename from CraftBukkit-Patches/0012-Inverted-Daylight-Detector-Toggle.patch rename to CraftBukkit-Patches/0011-Inverted-Daylight-Detector-Toggle.patch diff --git a/CraftBukkit-Patches/0013-Add-1.8-recipes-for-stone-variants.patch b/CraftBukkit-Patches/0012-Add-1.8-recipes-for-stone-variants.patch similarity index 100% rename from CraftBukkit-Patches/0013-Add-1.8-recipes-for-stone-variants.patch rename to CraftBukkit-Patches/0012-Add-1.8-recipes-for-stone-variants.patch diff --git a/CraftBukkit-Patches/0014-Ability-to-disable-asynccatcher.patch b/CraftBukkit-Patches/0013-Ability-to-disable-asynccatcher.patch similarity index 100% rename from CraftBukkit-Patches/0014-Ability-to-disable-asynccatcher.patch rename to CraftBukkit-Patches/0013-Ability-to-disable-asynccatcher.patch diff --git a/CraftBukkit-Patches/0015-Fix-redstone-lag-issues.patch b/CraftBukkit-Patches/0014-Fix-redstone-lag-issues.patch similarity index 100% rename from CraftBukkit-Patches/0015-Fix-redstone-lag-issues.patch rename to CraftBukkit-Patches/0014-Fix-redstone-lag-issues.patch diff --git a/CraftBukkit-Patches/0016-Do-not-remove-player-in-world-change.patch b/CraftBukkit-Patches/0015-Do-not-remove-player-in-world-change.patch similarity index 100% rename from CraftBukkit-Patches/0016-Do-not-remove-player-in-world-change.patch rename to CraftBukkit-Patches/0015-Do-not-remove-player-in-world-change.patch diff --git a/CraftBukkit-Patches/0017-Fix-directional-TNT-bias.patch b/CraftBukkit-Patches/0016-Fix-directional-TNT-bias.patch similarity index 100% rename from CraftBukkit-Patches/0017-Fix-directional-TNT-bias.patch rename to CraftBukkit-Patches/0016-Fix-directional-TNT-bias.patch diff --git a/CraftBukkit-Patches/0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch b/CraftBukkit-Patches/0017-Fix-zombie-sieges-and-their-spawn-mechanics.patch similarity index 100% rename from CraftBukkit-Patches/0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch rename to CraftBukkit-Patches/0017-Fix-zombie-sieges-and-their-spawn-mechanics.patch diff --git a/CraftBukkit-Patches/0019-Configurable-fishing-time-ranges.patch b/CraftBukkit-Patches/0018-Configurable-fishing-time-ranges.patch similarity index 100% rename from CraftBukkit-Patches/0019-Configurable-fishing-time-ranges.patch rename to CraftBukkit-Patches/0018-Configurable-fishing-time-ranges.patch diff --git a/CraftBukkit-Patches/0020-Allow-nerfed-mobs-to-jump.patch b/CraftBukkit-Patches/0019-Allow-nerfed-mobs-to-jump.patch similarity index 100% rename from CraftBukkit-Patches/0020-Allow-nerfed-mobs-to-jump.patch rename to CraftBukkit-Patches/0019-Allow-nerfed-mobs-to-jump.patch diff --git a/CraftBukkit-Patches/0021-Configurable-interaction-limit-restriction.patch b/CraftBukkit-Patches/0020-Configurable-interaction-limit-restriction.patch similarity index 100% rename from CraftBukkit-Patches/0021-Configurable-interaction-limit-restriction.patch rename to CraftBukkit-Patches/0020-Configurable-interaction-limit-restriction.patch diff --git a/CraftBukkit-Patches/0022-Player-Exhaustion-Multipliers.patch b/CraftBukkit-Patches/0021-Player-Exhaustion-Multipliers.patch similarity index 100% rename from CraftBukkit-Patches/0022-Player-Exhaustion-Multipliers.patch rename to CraftBukkit-Patches/0021-Player-Exhaustion-Multipliers.patch diff --git a/CraftBukkit-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch b/CraftBukkit-Patches/0022-Add-configurable-despawn-distances-for-living-entiti.patch similarity index 100% rename from CraftBukkit-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch rename to CraftBukkit-Patches/0022-Add-configurable-despawn-distances-for-living-entiti.patch diff --git a/CraftBukkit-Patches/0024-Don-t-tick-chests.patch b/CraftBukkit-Patches/0023-Don-t-tick-chests.patch similarity index 100% rename from CraftBukkit-Patches/0024-Don-t-tick-chests.patch rename to CraftBukkit-Patches/0023-Don-t-tick-chests.patch diff --git a/CraftBukkit-Patches/0025-Allow-disabling-of-spawn-chunks-always-being-loaded.patch b/CraftBukkit-Patches/0024-Allow-disabling-of-spawn-chunks-always-being-loaded.patch similarity index 100% rename from CraftBukkit-Patches/0025-Allow-disabling-of-spawn-chunks-always-being-loaded.patch rename to CraftBukkit-Patches/0024-Allow-disabling-of-spawn-chunks-always-being-loaded.patch diff --git a/CraftBukkit-Patches/0025-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0025-Fix-Null-Tile-Entity-Worlds.patch new file mode 100644 index 0000000000..6356c90716 --- /dev/null +++ b/CraftBukkit-Patches/0025-Fix-Null-Tile-Entity-Worlds.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Evan A. Haskell" +Date: Thu, 26 Jun 2014 18:37:29 -0400 +Subject: [PATCH] Fix Null Tile Entity Worlds + + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { + } + } + ++ tileentity.a(this); // PaperSpigot - No null worlds + this.a.add(tileentity); + } else { + this.tileEntityList.add(tileentity); +-- \ No newline at end of file