diff --git a/CraftBukkit-Patches/0149-Rename-to-PaperSpigot.patch b/CraftBukkit-Patches/0147-Rename-to-PaperSpigot.patch similarity index 81% rename from CraftBukkit-Patches/0149-Rename-to-PaperSpigot.patch rename to CraftBukkit-Patches/0147-Rename-to-PaperSpigot.patch index 51cd5b592..737a82ccb 100644 --- a/CraftBukkit-Patches/0149-Rename-to-PaperSpigot.patch +++ b/CraftBukkit-Patches/0147-Rename-to-PaperSpigot.patch @@ -1,14 +1,14 @@ -From 33e33efcbabfaf4dc2beb6ac2a0dab488ecbd620 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: gsand Date: Tue, 15 Apr 2014 07:12:20 -0700 Subject: [PATCH] Rename to PaperSpigot diff --git a/pom.xml b/pom.xml -index df02bd3..e068516 100644 +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/pom.xml +++ b/pom.xml -@@ -2,7 +2,7 @@ +@@ -0,0 +0,0 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.spigotmc @@ -17,7 +17,7 @@ index df02bd3..e068516 100644 jar 1.7.9-R0.3-SNAPSHOT Spigot -@@ -119,7 +119,7 @@ +@@ -0,0 +0,0 @@ gitdescribe-maven-plugin 1.3 @@ -26,6 +26,4 @@ index df02bd3..e068516 100644 --- -1.9.1 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0150-Prevent-null-hopper-owners-crashing-the-server.patch b/CraftBukkit-Patches/0148-Prevent-null-hopper-owners-crashing-the-server.patch similarity index 97% rename from CraftBukkit-Patches/0150-Prevent-null-hopper-owners-crashing-the-server.patch rename to CraftBukkit-Patches/0148-Prevent-null-hopper-owners-crashing-the-server.patch index f7f60d08c..3dff6aa68 100644 --- a/CraftBukkit-Patches/0150-Prevent-null-hopper-owners-crashing-the-server.patch +++ b/CraftBukkit-Patches/0148-Prevent-null-hopper-owners-crashing-the-server.patch @@ -14,11 +14,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - if (!this.k()) { - flag = this.x(); -- } -- -- if (!this.l()) { -- flag = suckInItems(this) || flag; -- } + try { // PaperSpigot Start (Try/catch to prevent null owner crash) + if (!this.k()) { + flag = this.x(); @@ -26,8 +21,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } 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; diff --git a/CraftBukkit-Patches/0151-Allow-undead-horse-types-to-be-leashed.patch b/CraftBukkit-Patches/0149-Allow-undead-horse-types-to-be-leashed.patch similarity index 100% rename from CraftBukkit-Patches/0151-Allow-undead-horse-types-to-be-leashed.patch rename to CraftBukkit-Patches/0149-Allow-undead-horse-types-to-be-leashed.patch diff --git a/CraftBukkit-Patches/0152-Teleport-passenger-vehicle-with-player.patch b/CraftBukkit-Patches/0150-Teleport-passenger-vehicle-with-player.patch similarity index 100% rename from CraftBukkit-Patches/0152-Teleport-passenger-vehicle-with-player.patch rename to CraftBukkit-Patches/0150-Teleport-passenger-vehicle-with-player.patch diff --git a/CraftBukkit-Patches/0153-Invisible-players-don-t-have-rights.patch b/CraftBukkit-Patches/0151-Invisible-players-don-t-have-rights.patch similarity index 100% rename from CraftBukkit-Patches/0153-Invisible-players-don-t-have-rights.patch rename to CraftBukkit-Patches/0151-Invisible-players-don-t-have-rights.patch diff --git a/CraftBukkit-Patches/0154-Configurable-squid-spawn-ranges.patch b/CraftBukkit-Patches/0152-Configurable-squid-spawn-ranges.patch similarity index 100% rename from CraftBukkit-Patches/0154-Configurable-squid-spawn-ranges.patch rename to CraftBukkit-Patches/0152-Configurable-squid-spawn-ranges.patch diff --git a/CraftBukkit-Patches/0155-Add-getFloat-method-to-configs.patch b/CraftBukkit-Patches/0153-Add-getFloat-method-to-configs.patch similarity index 100% rename from CraftBukkit-Patches/0155-Add-getFloat-method-to-configs.patch rename to CraftBukkit-Patches/0153-Add-getFloat-method-to-configs.patch diff --git a/CraftBukkit-Patches/0156-Configurable-damage-multiplier-for-PvP-blocking.patch b/CraftBukkit-Patches/0154-Configurable-damage-multiplier-for-PvP-blocking.patch similarity index 100% rename from CraftBukkit-Patches/0156-Configurable-damage-multiplier-for-PvP-blocking.patch rename to CraftBukkit-Patches/0154-Configurable-damage-multiplier-for-PvP-blocking.patch diff --git a/CraftBukkit-Patches/0157-Configurable-cactus-and-reed-natural-growth-heights.patch b/CraftBukkit-Patches/0155-Configurable-cactus-and-reed-natural-growth-heights.patch similarity index 100% rename from CraftBukkit-Patches/0157-Configurable-cactus-and-reed-natural-growth-heights.patch rename to CraftBukkit-Patches/0155-Configurable-cactus-and-reed-natural-growth-heights.patch diff --git a/CraftBukkit-Patches/0158-Configurable-baby-zombie-movement-speed.patch b/CraftBukkit-Patches/0156-Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from CraftBukkit-Patches/0158-Configurable-baby-zombie-movement-speed.patch rename to CraftBukkit-Patches/0156-Configurable-baby-zombie-movement-speed.patch diff --git a/CraftBukkit-Patches/0159-Make-destroyed-boats-drop-the-boat-item.patch b/CraftBukkit-Patches/0157-Make-destroyed-boats-drop-the-boat-item.patch similarity index 100% rename from CraftBukkit-Patches/0159-Make-destroyed-boats-drop-the-boat-item.patch rename to CraftBukkit-Patches/0157-Make-destroyed-boats-drop-the-boat-item.patch diff --git a/CraftBukkit-Patches/0160-Configurable-hunger-multiplier-for-player-sprint-jum.patch b/CraftBukkit-Patches/0158-Configurable-hunger-multiplier-for-player-sprint-jum.patch similarity index 100% rename from CraftBukkit-Patches/0160-Configurable-hunger-multiplier-for-player-sprint-jum.patch rename to CraftBukkit-Patches/0158-Configurable-hunger-multiplier-for-player-sprint-jum.patch diff --git a/CraftBukkit-Patches/0161-Inverted-Daylight-Detector-Toggle.patch b/CraftBukkit-Patches/0159-Inverted-Daylight-Detector-Toggle.patch similarity index 100% rename from CraftBukkit-Patches/0161-Inverted-Daylight-Detector-Toggle.patch rename to CraftBukkit-Patches/0159-Inverted-Daylight-Detector-Toggle.patch diff --git a/CraftBukkit-Patches/0162-Add-1.8-recipes-for-stone-variants.patch b/CraftBukkit-Patches/0160-Add-1.8-recipes-for-stone-variants.patch similarity index 100% rename from CraftBukkit-Patches/0162-Add-1.8-recipes-for-stone-variants.patch rename to CraftBukkit-Patches/0160-Add-1.8-recipes-for-stone-variants.patch diff --git a/CraftBukkit-Patches/0163-Fix-movement-inconsistencies.patch b/CraftBukkit-Patches/0161-Fix-movement-inconsistencies.patch similarity index 99% rename from CraftBukkit-Patches/0163-Fix-movement-inconsistencies.patch rename to CraftBukkit-Patches/0161-Fix-movement-inconsistencies.patch index 058bbd3c9..f3d6f1e34 100644 --- a/CraftBukkit-Patches/0163-Fix-movement-inconsistencies.patch +++ b/CraftBukkit-Patches/0161-Fix-movement-inconsistencies.patch @@ -58,12 +58,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + for (j = 0; j < list.size(); ++j) { + d0 = ((AxisAlignedBB) list.get(j)).a(this.boundingBox, d0); + } - -- this.boundingBox.d(0.0D, 0.0D, d2); -- if (!this.J && d8 != d2) { -- d2 = 0.0D; -- d1 = 0.0D; -- d0 = 0.0D; ++ + this.boundingBox.d(d0, 0.0D, 0.0D); + if (!this.J && d6 != d0) { + d2 = 0.0D; @@ -85,7 +80,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + for (int i = 0; i < list.size(); ++i) { + d1 = ((AxisAlignedBB) list.get(i)).b(this.boundingBox, d1); + } -+ + +- this.boundingBox.d(0.0D, 0.0D, d2); +- if (!this.J && d8 != d2) { +- d2 = 0.0D; +- d1 = 0.0D; +- d0 = 0.0D; + this.boundingBox.d(0.0D, d1, 0.0D); + if (!this.J && d7 != d1) { + d2 = 0.0D; diff --git a/CraftBukkit-Patches/0164-Fix-redstone-lag-issues.patch b/CraftBukkit-Patches/0162-Fix-redstone-lag-issues.patch similarity index 100% rename from CraftBukkit-Patches/0164-Fix-redstone-lag-issues.patch rename to CraftBukkit-Patches/0162-Fix-redstone-lag-issues.patch diff --git a/CraftBukkit-Patches/0165-Ability-to-disable-asynccatcher.patch b/CraftBukkit-Patches/0163-Ability-to-disable-asynccatcher.patch similarity index 100% rename from CraftBukkit-Patches/0165-Ability-to-disable-asynccatcher.patch rename to CraftBukkit-Patches/0163-Ability-to-disable-asynccatcher.patch