From 7a921fe094807e76baa119e01b71d5f3683dd8b0 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Mon, 4 Aug 2014 15:11:38 -0500 Subject: [PATCH] Update CraftBukkit --- CraftBukkit | 2 +- ...46-Cross-World-Entity-Teleportation.patch} | 0 ...d-Fireball-EntityDamageByEntityEvent.patch | 20 ------------------- ...block-placement-interaction-packets.patch} | 0 ...atch => 0148-Better-item-validation.patch} | 0 ... => 0149-Further-Seed-Customisation.patch} | 0 ...> 0150-Disable-ResourceLeakDetector.patch} | 0 ...-Information-to-session.lock-Errors.patch} | 0 ...ng.patch => 0152-Safer-JSON-Loading.patch} | 0 ... => 0153-Fix-Slow-Loading-Libraries.patch} | 0 ...h => 0154-Add-CommandLine-EULA-Flag.patch} | 0 ...isnamed-function-from-1.7.10-update.patch} | 0 ...g-table-wiping-meta-when-placing-st.patch} | 0 ...-ocelots-when-plugins-spawn-ocelots.patch} | 0 ...revent-a-crash-involving-attributes.patch} | 0 ...anning.patch => 0159-Fix-IP-banning.patch} | 0 ...ke-moved-wrongly-limit-configurable.patch} | 0 ...=> 0161-Fix-Null-Tile-Entity-Worlds.patch} | 0 ...oved-too-quickly-limit-configurable.patch} | 0 ...63-Log-debug-levels-to-the-log-file.patch} | 0 ... => 0164-Alternative-Hopper-Ticking.patch} | 0 ...Apply-NBTReadLimiter-to-more-things.patch} | 0 ...tch => 0166-Allow-Attribute-Capping.patch} | 0 ...-a-global-cache-for-any-request-on-.patch} | 0 ...fetch-an-online-UUID-in-online-mode.patch} | 0 ...modifiers-which-cause-the-attribute.patch} | 0 ...ed-diff-from-Minecraft-1.3.1-update.patch} | 2 +- 27 files changed, 2 insertions(+), 22 deletions(-) rename CraftBukkit-Patches/{0147-Cross-World-Entity-Teleportation.patch => 0146-Cross-World-Entity-Teleportation.patch} (100%) delete mode 100644 CraftBukkit-Patches/0146-Fix-ItemFrame-and-Fireball-EntityDamageByEntityEvent.patch rename CraftBukkit-Patches/{0148-Limit-block-placement-interaction-packets.patch => 0147-Limit-block-placement-interaction-packets.patch} (100%) rename CraftBukkit-Patches/{0149-Better-item-validation.patch => 0148-Better-item-validation.patch} (100%) rename CraftBukkit-Patches/{0150-Further-Seed-Customisation.patch => 0149-Further-Seed-Customisation.patch} (100%) rename CraftBukkit-Patches/{0151-Disable-ResourceLeakDetector.patch => 0150-Disable-ResourceLeakDetector.patch} (100%) rename CraftBukkit-Patches/{0152-Add-More-Information-to-session.lock-Errors.patch => 0151-Add-More-Information-to-session.lock-Errors.patch} (100%) rename CraftBukkit-Patches/{0153-Safer-JSON-Loading.patch => 0152-Safer-JSON-Loading.patch} (100%) rename CraftBukkit-Patches/{0154-Fix-Slow-Loading-Libraries.patch => 0153-Fix-Slow-Loading-Libraries.patch} (100%) rename CraftBukkit-Patches/{0155-Add-CommandLine-EULA-Flag.patch => 0154-Add-CommandLine-EULA-Flag.patch} (100%) rename CraftBukkit-Patches/{0156-Fix-misnamed-function-from-1.7.10-update.patch => 0155-Fix-misnamed-function-from-1.7.10-update.patch} (100%) rename CraftBukkit-Patches/{0157-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch => 0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch} (100%) rename CraftBukkit-Patches/{0158-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch => 0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch} (100%) rename CraftBukkit-Patches/{0159-Prevent-a-crash-involving-attributes.patch => 0158-Prevent-a-crash-involving-attributes.patch} (100%) rename CraftBukkit-Patches/{0160-Fix-IP-banning.patch => 0159-Fix-IP-banning.patch} (100%) rename CraftBukkit-Patches/{0161-Make-moved-wrongly-limit-configurable.patch => 0160-Make-moved-wrongly-limit-configurable.patch} (100%) rename CraftBukkit-Patches/{0162-Fix-Null-Tile-Entity-Worlds.patch => 0161-Fix-Null-Tile-Entity-Worlds.patch} (100%) rename CraftBukkit-Patches/{0163-Make-moved-too-quickly-limit-configurable.patch => 0162-Make-moved-too-quickly-limit-configurable.patch} (100%) rename CraftBukkit-Patches/{0164-Log-debug-levels-to-the-log-file.patch => 0163-Log-debug-levels-to-the-log-file.patch} (100%) rename CraftBukkit-Patches/{0165-Alternative-Hopper-Ticking.patch => 0164-Alternative-Hopper-Ticking.patch} (100%) rename CraftBukkit-Patches/{0166-Apply-NBTReadLimiter-to-more-things.patch => 0165-Apply-NBTReadLimiter-to-more-things.patch} (100%) rename CraftBukkit-Patches/{0167-Allow-Attribute-Capping.patch => 0166-Allow-Attribute-Capping.patch} (100%) rename CraftBukkit-Patches/{0168-Add-an-option-for-a-global-cache-for-any-request-on-.patch => 0167-Add-an-option-for-a-global-cache-for-any-request-on-.patch} (100%) rename CraftBukkit-Patches/{0169-Only-fetch-an-online-UUID-in-online-mode.patch => 0168-Only-fetch-an-online-UUID-in-online-mode.patch} (100%) rename CraftBukkit-Patches/{0170-Filter-attribute-modifiers-which-cause-the-attribute.patch => 0169-Filter-attribute-modifiers-which-cause-the-attribute.patch} (100%) rename CraftBukkit-Patches/{0171-Fix-missed-diff-from-Minecraft-1.3.1-update.patch => 0170-Fix-missed-diff-from-Minecraft-1.3.1-update.patch} (99%) diff --git a/CraftBukkit b/CraftBukkit index 37c7969161..a04b586418 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 37c79691615fbd28b49c7371a64700e4f5713eca +Subproject commit a04b586418538c428d0e464df3e2a1f3b06889fd diff --git a/CraftBukkit-Patches/0147-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0146-Cross-World-Entity-Teleportation.patch similarity index 100% rename from CraftBukkit-Patches/0147-Cross-World-Entity-Teleportation.patch rename to CraftBukkit-Patches/0146-Cross-World-Entity-Teleportation.patch diff --git a/CraftBukkit-Patches/0146-Fix-ItemFrame-and-Fireball-EntityDamageByEntityEvent.patch b/CraftBukkit-Patches/0146-Fix-ItemFrame-and-Fireball-EntityDamageByEntityEvent.patch deleted file mode 100644 index 2609732cc4..0000000000 --- a/CraftBukkit-Patches/0146-Fix-ItemFrame-and-Fireball-EntityDamageByEntityEvent.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zach Brown <1254957+zachbr@users.noreply.github.com> -Date: Tue, 24 Jun 2014 09:51:05 -0500 -Subject: [PATCH] Fix ItemFrame and Fireball EntityDamageByEntityEvent - - -diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -0,0 +0,0 @@ public class CraftEventFactory { - if (event == null) { - return false; - } -- return event.isCancelled() || event.getDamage() == 0; -+ return event.isCancelled(); - } - - public static PlayerLevelChangeEvent callPlayerLevelChangeEvent(Player player, int oldLevel, int newLevel) { --- \ No newline at end of file diff --git a/CraftBukkit-Patches/0148-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0147-Limit-block-placement-interaction-packets.patch similarity index 100% rename from CraftBukkit-Patches/0148-Limit-block-placement-interaction-packets.patch rename to CraftBukkit-Patches/0147-Limit-block-placement-interaction-packets.patch diff --git a/CraftBukkit-Patches/0149-Better-item-validation.patch b/CraftBukkit-Patches/0148-Better-item-validation.patch similarity index 100% rename from CraftBukkit-Patches/0149-Better-item-validation.patch rename to CraftBukkit-Patches/0148-Better-item-validation.patch diff --git a/CraftBukkit-Patches/0150-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0149-Further-Seed-Customisation.patch similarity index 100% rename from CraftBukkit-Patches/0150-Further-Seed-Customisation.patch rename to CraftBukkit-Patches/0149-Further-Seed-Customisation.patch diff --git a/CraftBukkit-Patches/0151-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0150-Disable-ResourceLeakDetector.patch similarity index 100% rename from CraftBukkit-Patches/0151-Disable-ResourceLeakDetector.patch rename to CraftBukkit-Patches/0150-Disable-ResourceLeakDetector.patch diff --git a/CraftBukkit-Patches/0152-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0151-Add-More-Information-to-session.lock-Errors.patch similarity index 100% rename from CraftBukkit-Patches/0152-Add-More-Information-to-session.lock-Errors.patch rename to CraftBukkit-Patches/0151-Add-More-Information-to-session.lock-Errors.patch diff --git a/CraftBukkit-Patches/0153-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0152-Safer-JSON-Loading.patch similarity index 100% rename from CraftBukkit-Patches/0153-Safer-JSON-Loading.patch rename to CraftBukkit-Patches/0152-Safer-JSON-Loading.patch diff --git a/CraftBukkit-Patches/0154-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0153-Fix-Slow-Loading-Libraries.patch similarity index 100% rename from CraftBukkit-Patches/0154-Fix-Slow-Loading-Libraries.patch rename to CraftBukkit-Patches/0153-Fix-Slow-Loading-Libraries.patch diff --git a/CraftBukkit-Patches/0155-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0154-Add-CommandLine-EULA-Flag.patch similarity index 100% rename from CraftBukkit-Patches/0155-Add-CommandLine-EULA-Flag.patch rename to CraftBukkit-Patches/0154-Add-CommandLine-EULA-Flag.patch diff --git a/CraftBukkit-Patches/0156-Fix-misnamed-function-from-1.7.10-update.patch b/CraftBukkit-Patches/0155-Fix-misnamed-function-from-1.7.10-update.patch similarity index 100% rename from CraftBukkit-Patches/0156-Fix-misnamed-function-from-1.7.10-update.patch rename to CraftBukkit-Patches/0155-Fix-misnamed-function-from-1.7.10-update.patch diff --git a/CraftBukkit-Patches/0157-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch similarity index 100% rename from CraftBukkit-Patches/0157-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch rename to CraftBukkit-Patches/0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch diff --git a/CraftBukkit-Patches/0158-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch similarity index 100% rename from CraftBukkit-Patches/0158-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch rename to CraftBukkit-Patches/0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch diff --git a/CraftBukkit-Patches/0159-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0158-Prevent-a-crash-involving-attributes.patch similarity index 100% rename from CraftBukkit-Patches/0159-Prevent-a-crash-involving-attributes.patch rename to CraftBukkit-Patches/0158-Prevent-a-crash-involving-attributes.patch diff --git a/CraftBukkit-Patches/0160-Fix-IP-banning.patch b/CraftBukkit-Patches/0159-Fix-IP-banning.patch similarity index 100% rename from CraftBukkit-Patches/0160-Fix-IP-banning.patch rename to CraftBukkit-Patches/0159-Fix-IP-banning.patch diff --git a/CraftBukkit-Patches/0161-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0160-Make-moved-wrongly-limit-configurable.patch similarity index 100% rename from CraftBukkit-Patches/0161-Make-moved-wrongly-limit-configurable.patch rename to CraftBukkit-Patches/0160-Make-moved-wrongly-limit-configurable.patch diff --git a/CraftBukkit-Patches/0162-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0161-Fix-Null-Tile-Entity-Worlds.patch similarity index 100% rename from CraftBukkit-Patches/0162-Fix-Null-Tile-Entity-Worlds.patch rename to CraftBukkit-Patches/0161-Fix-Null-Tile-Entity-Worlds.patch diff --git a/CraftBukkit-Patches/0163-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0162-Make-moved-too-quickly-limit-configurable.patch similarity index 100% rename from CraftBukkit-Patches/0163-Make-moved-too-quickly-limit-configurable.patch rename to CraftBukkit-Patches/0162-Make-moved-too-quickly-limit-configurable.patch diff --git a/CraftBukkit-Patches/0164-Log-debug-levels-to-the-log-file.patch b/CraftBukkit-Patches/0163-Log-debug-levels-to-the-log-file.patch similarity index 100% rename from CraftBukkit-Patches/0164-Log-debug-levels-to-the-log-file.patch rename to CraftBukkit-Patches/0163-Log-debug-levels-to-the-log-file.patch diff --git a/CraftBukkit-Patches/0165-Alternative-Hopper-Ticking.patch b/CraftBukkit-Patches/0164-Alternative-Hopper-Ticking.patch similarity index 100% rename from CraftBukkit-Patches/0165-Alternative-Hopper-Ticking.patch rename to CraftBukkit-Patches/0164-Alternative-Hopper-Ticking.patch diff --git a/CraftBukkit-Patches/0166-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0165-Apply-NBTReadLimiter-to-more-things.patch similarity index 100% rename from CraftBukkit-Patches/0166-Apply-NBTReadLimiter-to-more-things.patch rename to CraftBukkit-Patches/0165-Apply-NBTReadLimiter-to-more-things.patch diff --git a/CraftBukkit-Patches/0167-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0166-Allow-Attribute-Capping.patch similarity index 100% rename from CraftBukkit-Patches/0167-Allow-Attribute-Capping.patch rename to CraftBukkit-Patches/0166-Allow-Attribute-Capping.patch diff --git a/CraftBukkit-Patches/0168-Add-an-option-for-a-global-cache-for-any-request-on-.patch b/CraftBukkit-Patches/0167-Add-an-option-for-a-global-cache-for-any-request-on-.patch similarity index 100% rename from CraftBukkit-Patches/0168-Add-an-option-for-a-global-cache-for-any-request-on-.patch rename to CraftBukkit-Patches/0167-Add-an-option-for-a-global-cache-for-any-request-on-.patch diff --git a/CraftBukkit-Patches/0169-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0168-Only-fetch-an-online-UUID-in-online-mode.patch similarity index 100% rename from CraftBukkit-Patches/0169-Only-fetch-an-online-UUID-in-online-mode.patch rename to CraftBukkit-Patches/0168-Only-fetch-an-online-UUID-in-online-mode.patch diff --git a/CraftBukkit-Patches/0170-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0169-Filter-attribute-modifiers-which-cause-the-attribute.patch similarity index 100% rename from CraftBukkit-Patches/0170-Filter-attribute-modifiers-which-cause-the-attribute.patch rename to CraftBukkit-Patches/0169-Filter-attribute-modifiers-which-cause-the-attribute.patch diff --git a/CraftBukkit-Patches/0171-Fix-missed-diff-from-Minecraft-1.3.1-update.patch b/CraftBukkit-Patches/0170-Fix-missed-diff-from-Minecraft-1.3.1-update.patch similarity index 99% rename from CraftBukkit-Patches/0171-Fix-missed-diff-from-Minecraft-1.3.1-update.patch rename to CraftBukkit-Patches/0170-Fix-missed-diff-from-Minecraft-1.3.1-update.patch index d064bedb42..946f8867e7 100644 --- a/CraftBukkit-Patches/0171-Fix-missed-diff-from-Minecraft-1.3.1-update.patch +++ b/CraftBukkit-Patches/0170-Fix-missed-diff-from-Minecraft-1.3.1-update.patch @@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public class PlayerChunkMap { this.a(pair.x, pair.z, true).a(entityplayer); } - + - if (i1 > 1 || i1 < -1 || j1 > 1 || j1 < -1) { + if (j1 > 1 || j1 < -1 || k1 > 1 || k1 < -1) { // Spigot - missed diff Collections.sort(entityplayer.chunkCoordIntPairQueue, new ChunkCoordComparator(entityplayer));