From c1641b8e0cfaed3e3ff3907d6e78f0952e424c7f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 20 Jan 2017 05:21:44 -0600 Subject: [PATCH] Update upstream B/CB/S --- .../0035-Arrow-pickup-rule-API.patch | 23 +++++--- Spigot-Server-Patches/0005-Timings-v2.patch | 40 ++++++------- .../0038-Disable-thunder.patch | 6 +- .../0039-Disable-ice-and-snow.patch | 6 +- .../0087-Don-t-teleport-dead-entities.patch | 6 +- ...le-spawn-chances-for-skeleton-horses.patch | 6 +- ...sable-BlockPhysicsEvent-for-Redstone.patch | 10 ++-- .../0124-Arrow-pickup-rule-API.patch | 58 ------------------- ...dispenser-dropper-furnace-placement.patch} | 2 +- ...mprove-Minecraft-Hopper-Performance.patch} | 2 +- ...possibility-for-getServer-singleton.patch} | 2 +- ...tem-frames-performance-and-bug-fixe.patch} | 4 +- ...API-Replenishable-Lootables-Feature.patch} | 4 +- ...-Do-not-load-chunks-for-pathfinding.patch} | 2 +- ...> 0130-Entity-Tracking-Improvements.patch} | 4 +- ...-scoreboard-teams-to-scoreboard.dat.patch} | 2 +- ...unks-as-active-for-neighbor-updates.patch} | 2 +- ... 0133-Fix-Chunk-Unload-Queue-Issues.patch} | 2 +- ...em-property-for-disabling-watchdoge.patch} | 4 +- ...mize-EAR.patch => 0135-Optimize-EAR.patch} | 2 +- ...0136-Optimize-UserCache-Thread-Safe.patch} | 2 +- ...locking-on-Network-Manager-creation.patch} | 2 +- ...8-Optional-old-TNT-cannon-behaviors.patch} | 6 +- ...-redstone-torch-rapid-clock-removal.patch} | 2 +- ...Ensure-Chunks-never-ever-load-async.patch} | 2 +- ...h => 0141-Add-server-name-parameter.patch} | 4 +- ...n-Wither-Death-sounds-to-same-world.patch} | 2 +- ...FallingBlocks-being-stuck-on-fences.patch} | 2 +- ...0144-Make-entities-look-for-hoppers.patch} | 4 +- ...nk-Unloads-based-on-Player-Movement.patch} | 2 +- ... 0146-Toggleable-Elytra-Wall-Damage.patch} | 4 +- ...=> 0147-Fix-Double-World-Add-issues.patch} | 4 +- ...tch => 0148-Fix-Old-Sign-Conversion.patch} | 2 +- ...-profiles-that-have-no-UUID-and-no-.patch} | 2 +- ...ative-vehicle-moved-wrongly-message.patch} | 4 +- ...rs-that-dismount-from-other-players.patch} | 2 +- ...etting-for-proxy-online-mode-status.patch} | 2 +- ...-BlockStateEnum-hashCode-and-equals.patch} | 2 +- ...0154-Disable-ticking-of-snow-blocks.patch} | 2 +- ...rt-new-health-to-a-float-during-set.patch} | 2 +- ...56-Fix-AIOOBE-in-inventory-handling.patch} | 4 +- ...nfigurable-packet-in-spam-threshold.patch} | 4 +- ...8-Configurable-flying-kick-messages.patch} | 4 +- ...atch => 0159-Auto-Save-Improvements.patch} | 10 ++-- ...ch => 0160-Chunk-registration-fixes.patch} | 4 +- ...k-reference-on-Craft-Entity-removal.patch} | 2 +- ...to-fix-bad-Y-levels-on-player-login.patch} | 2 +- ...ring-limit-for-packet-serialization.patch} | 2 +- ...ch => 0164-Disable-Vanilla-Chunk-GC.patch} | 8 +-- ...ion-to-remove-corrupt-tile-entities.patch} | 2 +- ...nt.patch => 0166-Add-EntityZapEvent.patch} | 2 +- ...hunks-from-Hoppers-and-other-things.patch} | 2 +- ...ent-Auto-Save-if-Save-Queue-is-full.patch} | 2 +- ... 0169-Chunk-Save-Stats-Debug-Option.patch} | 2 +- ...-from-ArmorStand-and-SpawnEgg-items.patch} | 2 +- ...71-Cache-user-authenticator-threads.patch} | 2 +- ...atch => 0172-Optimize-Network-Queue.patch} | 2 +- ...tch => 0173-Optimise-NetworkManager.patch} | 2 +- ....patch => 0174-Optimise-removeQueue.patch} | 2 +- ...-Allow-Reloading-of-Command-Aliases.patch} | 2 +- ...-Add-source-to-PlayerExpChangeEvent.patch} | 2 +- ...mize-World.isLoaded-BlockPosition-Z.patch} | 4 +- ...Speedup-BlockPos-by-fixing-inlining.patch} | 2 +- ...-Don-t-let-fishinghooks-use-portals.patch} | 4 +- ... => 0180-Add-ProjectileCollideEvent.patch} | 2 +- ...-Vanished-players-don-t-have-rights.patch} | 6 +- ...ent-Pathfinding-out-of-World-Border.patch} | 2 +- ...re-invalid-Marker-Icon-ID-s-in-maps.patch} | 2 +- ...Bound-Treasure-Maps-to-World-Border.patch} | 2 +- ...igurable-Cartographer-Treasure-Maps.patch} | 2 +- ... => 0186-Optimize-ItemStack.isEmpty.patch} | 2 +- ...o-control-if-armour-stands-can-move.patch} | 2 +- ...-armor-stands-from-doing-entity-loo.patch} | 4 +- ...option-to-remove-invalid-statistics.patch} | 2 +- ...nt.patch => 0190-IllegalPacketEvent.patch} | 4 +- ...1-Properly-fix-item-duplication-bug.patch} | 2 +- ...=> 0192-String-based-Action-Bar-API.patch} | 2 +- ... 0193-Activation-Range-Improvements.patch} | 4 +- ...-API-s.patch => 0194-Firework-API-s.patch} | 2 +- ...ated-Build-Download-URL-to-Paper-CI.patch} | 2 +- ... 0196-PlayerTeleportEndGatewayEvent.patch} | 2 +- ...re-Improper-Anvil-Item-Name-Packets.patch} | 4 +- ...low-31-instead-of-30-for-item-names.patch} | 4 +- ... => 0199-ShulkerBox-Dupe-Prevention.patch} | 2 +- ...ovide-E-TE-Chunk-count-stat-methods.patch} | 4 +- ...h => 0201-Enforce-Sync-Player-Saves.patch} | 6 +- ... => 0202-Enforce-Sync-Chunk-Unloads.patch} | 4 +- ...low-entities-to-ride-themselves-572.patch} | 6 +- ...atch => 0204-Fix-block-break-desync.patch} | 6 +- ...ign-the-World-in-WorldGenStronghold.patch} | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 93 files changed, 177 insertions(+), 226 deletions(-) delete mode 100644 Spigot-Server-Patches/0124-Arrow-pickup-rule-API.patch rename Spigot-Server-Patches/{0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch => 0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch} (97%) rename Spigot-Server-Patches/{0126-Improve-Minecraft-Hopper-Performance.patch => 0125-Improve-Minecraft-Hopper-Performance.patch} (98%) rename Spigot-Server-Patches/{0127-remove-null-possibility-for-getServer-singleton.patch => 0126-remove-null-possibility-for-getServer-singleton.patch} (96%) rename Spigot-Server-Patches/{0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (98%) rename Spigot-Server-Patches/{0129-LootTable-API-Replenishable-Lootables-Feature.patch => 0128-LootTable-API-Replenishable-Lootables-Feature.patch} (99%) rename Spigot-Server-Patches/{0130-Do-not-load-chunks-for-pathfinding.patch => 0129-Do-not-load-chunks-for-pathfinding.patch} (92%) rename Spigot-Server-Patches/{0131-Entity-Tracking-Improvements.patch => 0130-Entity-Tracking-Improvements.patch} (97%) rename Spigot-Server-Patches/{0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (96%) rename Spigot-Server-Patches/{0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch => 0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch} (97%) rename Spigot-Server-Patches/{0134-Fix-Chunk-Unload-Queue-Issues.patch => 0133-Fix-Chunk-Unload-Queue-Issues.patch} (96%) rename Spigot-Server-Patches/{0135-System-property-for-disabling-watchdoge.patch => 0134-System-property-for-disabling-watchdoge.patch} (90%) rename Spigot-Server-Patches/{0136-Optimize-EAR.patch => 0135-Optimize-EAR.patch} (97%) rename Spigot-Server-Patches/{0137-Optimize-UserCache-Thread-Safe.patch => 0136-Optimize-UserCache-Thread-Safe.patch} (98%) rename Spigot-Server-Patches/{0138-Avoid-blocking-on-Network-Manager-creation.patch => 0137-Avoid-blocking-on-Network-Manager-creation.patch} (97%) rename Spigot-Server-Patches/{0139-Optional-old-TNT-cannon-behaviors.patch => 0138-Optional-old-TNT-cannon-behaviors.patch} (99%) rename Spigot-Server-Patches/{0140-Faster-redstone-torch-rapid-clock-removal.patch => 0139-Faster-redstone-torch-rapid-clock-removal.patch} (96%) rename Spigot-Server-Patches/{0141-Ensure-Chunks-never-ever-load-async.patch => 0140-Ensure-Chunks-never-ever-load-async.patch} (97%) rename Spigot-Server-Patches/{0142-Add-server-name-parameter.patch => 0141-Add-server-name-parameter.patch} (90%) rename Spigot-Server-Patches/{0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (97%) rename Spigot-Server-Patches/{0144-Fix-FallingBlocks-being-stuck-on-fences.patch => 0143-Fix-FallingBlocks-being-stuck-on-fences.patch} (98%) rename Spigot-Server-Patches/{0145-Make-entities-look-for-hoppers.patch => 0144-Make-entities-look-for-hoppers.patch} (99%) rename Spigot-Server-Patches/{0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (99%) rename Spigot-Server-Patches/{0147-Toggleable-Elytra-Wall-Damage.patch => 0146-Toggleable-Elytra-Wall-Damage.patch} (95%) rename Spigot-Server-Patches/{0148-Fix-Double-World-Add-issues.patch => 0147-Fix-Double-World-Add-issues.patch} (95%) rename Spigot-Server-Patches/{0149-Fix-Old-Sign-Conversion.patch => 0148-Fix-Old-Sign-Conversion.patch} (98%) rename Spigot-Server-Patches/{0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (93%) rename Spigot-Server-Patches/{0151-More-informative-vehicle-moved-wrongly-message.patch => 0150-More-informative-vehicle-moved-wrongly-message.patch} (91%) rename Spigot-Server-Patches/{0152-Re-track-players-that-dismount-from-other-players.patch => 0151-Re-track-players-that-dismount-from-other-players.patch} (94%) rename Spigot-Server-Patches/{0153-Add-setting-for-proxy-online-mode-status.patch => 0152-Add-setting-for-proxy-online-mode-status.patch} (97%) rename Spigot-Server-Patches/{0154-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0153-Optimise-BlockStateEnum-hashCode-and-equals.patch} (97%) rename Spigot-Server-Patches/{0155-Disable-ticking-of-snow-blocks.patch => 0154-Disable-ticking-of-snow-blocks.patch} (94%) rename Spigot-Server-Patches/{0156-Convert-new-health-to-a-float-during-set.patch => 0155-Convert-new-health-to-a-float-during-set.patch} (94%) rename Spigot-Server-Patches/{0157-Fix-AIOOBE-in-inventory-handling.patch => 0156-Fix-AIOOBE-in-inventory-handling.patch} (91%) rename Spigot-Server-Patches/{0158-Configurable-packet-in-spam-threshold.patch => 0157-Configurable-packet-in-spam-threshold.patch} (96%) rename Spigot-Server-Patches/{0159-Configurable-flying-kick-messages.patch => 0158-Configurable-flying-kick-messages.patch} (96%) rename Spigot-Server-Patches/{0160-Auto-Save-Improvements.patch => 0159-Auto-Save-Improvements.patch} (97%) rename Spigot-Server-Patches/{0161-Chunk-registration-fixes.patch => 0160-Chunk-registration-fixes.patch} (91%) rename Spigot-Server-Patches/{0162-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0161-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (93%) rename Spigot-Server-Patches/{0163-Auto-fix-bad-Y-levels-on-player-login.patch => 0162-Auto-fix-bad-Y-levels-on-player-login.patch} (92%) rename Spigot-Server-Patches/{0164-Raise-string-limit-for-packet-serialization.patch => 0163-Raise-string-limit-for-packet-serialization.patch} (95%) rename Spigot-Server-Patches/{0165-Disable-Vanilla-Chunk-GC.patch => 0164-Disable-Vanilla-Chunk-GC.patch} (83%) rename Spigot-Server-Patches/{0166-Option-to-remove-corrupt-tile-entities.patch => 0165-Option-to-remove-corrupt-tile-entities.patch} (96%) rename Spigot-Server-Patches/{0167-Add-EntityZapEvent.patch => 0166-Add-EntityZapEvent.patch} (98%) rename Spigot-Server-Patches/{0168-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0167-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (96%) rename Spigot-Server-Patches/{0169-Prevent-Auto-Save-if-Save-Queue-is-full.patch => 0168-Prevent-Auto-Save-if-Save-Queue-is-full.patch} (98%) rename Spigot-Server-Patches/{0170-Chunk-Save-Stats-Debug-Option.patch => 0169-Chunk-Save-Stats-Debug-Option.patch} (98%) rename Spigot-Server-Patches/{0171-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0170-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (97%) rename Spigot-Server-Patches/{0172-Cache-user-authenticator-threads.patch => 0171-Cache-user-authenticator-threads.patch} (97%) rename Spigot-Server-Patches/{0173-Optimize-Network-Queue.patch => 0172-Optimize-Network-Queue.patch} (93%) rename Spigot-Server-Patches/{0174-Optimise-NetworkManager.patch => 0173-Optimise-NetworkManager.patch} (98%) rename Spigot-Server-Patches/{0175-Optimise-removeQueue.patch => 0174-Optimise-removeQueue.patch} (97%) rename Spigot-Server-Patches/{0176-Allow-Reloading-of-Command-Aliases.patch => 0175-Allow-Reloading-of-Command-Aliases.patch} (94%) rename Spigot-Server-Patches/{0177-Add-source-to-PlayerExpChangeEvent.patch => 0176-Add-source-to-PlayerExpChangeEvent.patch} (97%) rename Spigot-Server-Patches/{0178-Optimize-World.isLoaded-BlockPosition-Z.patch => 0177-Optimize-World.isLoaded-BlockPosition-Z.patch} (89%) rename Spigot-Server-Patches/{0179-Speedup-BlockPos-by-fixing-inlining.patch => 0178-Speedup-BlockPos-by-fixing-inlining.patch} (99%) rename Spigot-Server-Patches/{0180-Don-t-let-fishinghooks-use-portals.patch => 0179-Don-t-let-fishinghooks-use-portals.patch} (93%) rename Spigot-Server-Patches/{0181-Add-ProjectileCollideEvent.patch => 0180-Add-ProjectileCollideEvent.patch} (98%) rename Spigot-Server-Patches/{0182-Vanished-players-don-t-have-rights.patch => 0181-Vanished-players-don-t-have-rights.patch} (97%) rename Spigot-Server-Patches/{0183-Prevent-Pathfinding-out-of-World-Border.patch => 0182-Prevent-Pathfinding-out-of-World-Border.patch} (97%) rename Spigot-Server-Patches/{0184-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch => 0183-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch} (95%) rename Spigot-Server-Patches/{0185-Bound-Treasure-Maps-to-World-Border.patch => 0184-Bound-Treasure-Maps-to-World-Border.patch} (97%) rename Spigot-Server-Patches/{0186-Configurable-Cartographer-Treasure-Maps.patch => 0185-Configurable-Cartographer-Treasure-Maps.patch} (97%) rename Spigot-Server-Patches/{0187-Optimize-ItemStack.isEmpty.patch => 0186-Optimize-ItemStack.isEmpty.patch} (95%) rename Spigot-Server-Patches/{0188-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0187-Add-API-methods-to-control-if-armour-stands-can-move.patch} (96%) rename Spigot-Server-Patches/{0189-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0188-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (93%) rename Spigot-Server-Patches/{0190-Add-option-to-remove-invalid-statistics.patch => 0189-Add-option-to-remove-invalid-statistics.patch} (97%) rename Spigot-Server-Patches/{0191-IllegalPacketEvent.patch => 0190-IllegalPacketEvent.patch} (97%) rename Spigot-Server-Patches/{0192-Properly-fix-item-duplication-bug.patch => 0191-Properly-fix-item-duplication-bug.patch} (95%) rename Spigot-Server-Patches/{0193-String-based-Action-Bar-API.patch => 0192-String-based-Action-Bar-API.patch} (97%) rename Spigot-Server-Patches/{0194-Activation-Range-Improvements.patch => 0193-Activation-Range-Improvements.patch} (98%) rename Spigot-Server-Patches/{0195-Firework-API-s.patch => 0194-Firework-API-s.patch} (98%) rename Spigot-Server-Patches/{0196-Change-Outdated-Build-Download-URL-to-Paper-CI.patch => 0195-Change-Outdated-Build-Download-URL-to-Paper-CI.patch} (94%) rename Spigot-Server-Patches/{0197-PlayerTeleportEndGatewayEvent.patch => 0196-PlayerTeleportEndGatewayEvent.patch} (95%) rename Spigot-Server-Patches/{0198-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch => 0197-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch} (93%) rename Spigot-Server-Patches/{0199-MC-112017-Allow-31-instead-of-30-for-item-names.patch => 0198-MC-112017-Allow-31-instead-of-30-for-item-names.patch} (92%) rename Spigot-Server-Patches/{0200-ShulkerBox-Dupe-Prevention.patch => 0199-ShulkerBox-Dupe-Prevention.patch} (93%) rename Spigot-Server-Patches/{0201-Provide-E-TE-Chunk-count-stat-methods.patch => 0200-Provide-E-TE-Chunk-count-stat-methods.patch} (95%) rename Spigot-Server-Patches/{0202-Enforce-Sync-Player-Saves.patch => 0201-Enforce-Sync-Player-Saves.patch} (90%) rename Spigot-Server-Patches/{0203-Enforce-Sync-Chunk-Unloads.patch => 0202-Enforce-Sync-Chunk-Unloads.patch} (94%) rename Spigot-Server-Patches/{0204-Don-t-allow-entities-to-ride-themselves-572.patch => 0203-Don-t-allow-entities-to-ride-themselves-572.patch} (87%) rename Spigot-Server-Patches/{0205-Fix-block-break-desync.patch => 0204-Fix-block-break-desync.patch} (88%) rename Spigot-Server-Patches/{0206-Assign-the-World-in-WorldGenStronghold.patch => 0205-Assign-the-World-in-WorldGenStronghold.patch} (92%) diff --git a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch index 9240be4eb8..b27b92e86c 100644 --- a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch +++ b/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch @@ -1,16 +1,16 @@ -From e66a13a63d87c0064d5ae21c8c5215f2d2433212 Mon Sep 17 00:00:00 2001 +From 17223e9ba60ecfb981e037bcc62018b428d71808 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 4 Mar 2016 03:13:18 -0500 Subject: [PATCH] Arrow pickup rule API diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java -index e7a32f7..08095b9 100644 +index 1ff0951..da4678d 100644 --- a/src/main/java/org/bukkit/entity/Arrow.java +++ b/src/main/java/org/bukkit/entity/Arrow.java -@@ -40,6 +40,31 @@ public interface Arrow extends Projectile { - */ - public void setCritical(boolean critical); +@@ -72,6 +72,40 @@ public interface Arrow extends Projectile { + CREATIVE_ONLY + } + // Paper start + /** @@ -20,16 +20,25 @@ index e7a32f7..08095b9 100644 + * not fired from a bow with the infinity enchantment.

+ * + * @return The pickup rule ++ * @deprecated Use {@link Arrow#getPickupStatus()} as an upstream compatible replacement for this function + */ -+ PickupRule getPickupRule(); ++ @Deprecated ++ default PickupRule getPickupRule() { ++ return PickupRule.valueOf(this.getPickupStatus().name()); ++ } + + /** + * Set the rule for which players can pickup this arrow as an item. + * + * @param rule The pickup rule ++ * @deprecated Use {@link Arrow#setPickupStatus(PickupStatus)} with {@link PickupStatus} as an upstream compatible replacement for this function + */ -+ void setPickupRule(PickupRule rule); ++ @Deprecated ++ default void setPickupRule(PickupRule rule) { ++ this.setPickupStatus(PickupStatus.valueOf(rule.name())); ++ } + ++ @Deprecated + enum PickupRule { + DISALLOWED, + ALLOWED, diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch index fd82ced27a..9a04dd0518 100644 --- a/Spigot-Server-Patches/0005-Timings-v2.patch +++ b/Spigot-Server-Patches/0005-Timings-v2.patch @@ -1,4 +1,4 @@ -From f12d4e4b4091d002eeedd603a8f2ea637c5f734a Mon Sep 17 00:00:00 2001 +From 389912ff339c2edd5542e66afc749c588f15fe04 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -586,7 +586,7 @@ index cb83e4f..4dab9e9 100644 public boolean aa() { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index dd946b9..4d28933 100644 +index e7b1ebb..05312c6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace; @@ -625,7 +625,7 @@ index dd946b9..4d28933 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b231bfe..4fbe92a 100644 +index 318d57e..955e1f7 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -969,7 +969,7 @@ index a5a096b..c546139 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 027baa6..04b4980 100644 +index dc630c5..1248613 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -1017,7 +1017,7 @@ index 027baa6..04b4980 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 7be0135..9f52995 100644 +index c0af82b..676cc3f 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1103,7 +1103,7 @@ index 6958a2e..b3d3df4 100644 private static final RegistryMaterials> f = new RegistryMaterials(); protected World world; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 09ca809..47e3b4d 100644 +index b29375a..c2326cd 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,11 +18,11 @@ import com.google.common.collect.Maps; @@ -1209,10 +1209,10 @@ index 09ca809..47e3b4d 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 4713150..26627ce 100644 +index 391a09c..9669389 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -247,13 +247,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { timings.doChunkUnload.stopTiming(); // Spigot this.methodProfiler.c("tickPending"); @@ -1230,7 +1230,7 @@ index 4713150..26627ce 100644 this.methodProfiler.c("chunkMap"); timings.doChunkMap.startTiming(); // Spigot this.manager.flush(); -@@ -468,7 +468,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -469,7 +469,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { } } @@ -1239,7 +1239,7 @@ index 4713150..26627ce 100644 if (i > 0) { ChunkSection[] achunksection = chunk.getSections(); int i1 = achunksection.length; -@@ -496,6 +496,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -497,6 +497,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { } } } @@ -1247,7 +1247,7 @@ index 4713150..26627ce 100644 } this.methodProfiler.b(); -@@ -691,6 +692,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -692,6 +693,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { this.methodProfiler.a("cleaning"); @@ -1255,7 +1255,7 @@ index 4713150..26627ce 100644 NextTickListEntry nextticklistentry; for (int j = 0; j < i; ++j) { -@@ -704,9 +706,11 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -705,9 +707,11 @@ public class WorldServer extends World implements IAsyncTaskHandler { // this.nextTickListHash.remove(nextticklistentry); this.U.add(nextticklistentry); } @@ -1267,7 +1267,7 @@ index 4713150..26627ce 100644 Iterator iterator = this.U.iterator(); while (iterator.hasNext()) { -@@ -716,6 +720,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -717,6 +721,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (this.areChunksLoadedBetween(nextticklistentry.a.a(0, 0, 0), nextticklistentry.a.a(0, 0, 0))) { IBlockData iblockdata = this.getType(nextticklistentry.a); @@ -1276,7 +1276,7 @@ index 4713150..26627ce 100644 if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) { try { -@@ -728,10 +734,12 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -729,10 +735,12 @@ public class WorldServer extends World implements IAsyncTaskHandler { throw new ReportedException(crashreport); } } @@ -1289,7 +1289,7 @@ index 4713150..26627ce 100644 this.methodProfiler.b(); this.U.clear(); -@@ -827,7 +835,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -828,7 +836,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { gen = new org.bukkit.craftbukkit.generator.NormalChunkGenerator(this, this.getSeed()); } @@ -1298,7 +1298,7 @@ index 4713150..26627ce 100644 // CraftBukkit end } -@@ -992,6 +1000,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -993,6 +1001,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (chunkproviderserver.e()) { org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit @@ -1306,7 +1306,7 @@ index 4713150..26627ce 100644 if (iprogressupdate != null) { iprogressupdate.a("Saving level"); } -@@ -1001,7 +1010,9 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1002,7 +1011,9 @@ public class WorldServer extends World implements IAsyncTaskHandler { iprogressupdate.c("Saving chunks"); } @@ -1316,7 +1316,7 @@ index 4713150..26627ce 100644 // CraftBukkit - ArrayList -> Collection Collection arraylist = chunkproviderserver.a(); Iterator iterator = arraylist.iterator(); -@@ -1013,7 +1024,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1014,7 +1025,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { chunkproviderserver.unload(chunk); } } @@ -1325,7 +1325,7 @@ index 4713150..26627ce 100644 } } -@@ -1026,6 +1037,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1027,6 +1038,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { } protected void a() throws ExceptionWorldConflict { @@ -1333,7 +1333,7 @@ index 4713150..26627ce 100644 this.checkSession(); WorldServer[] aworldserver = this.server.worldServer; int i = aworldserver.length; -@@ -1055,6 +1067,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1056,6 +1068,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { this.worldData.e(this.getWorldBorder().i()); this.dataManager.saveWorldData(this.worldData, this.server.getPlayerList().t()); this.worldMaps.a(); diff --git a/Spigot-Server-Patches/0038-Disable-thunder.patch b/Spigot-Server-Patches/0038-Disable-thunder.patch index b74d4e432f..fc4a0779ad 100644 --- a/Spigot-Server-Patches/0038-Disable-thunder.patch +++ b/Spigot-Server-Patches/0038-Disable-thunder.patch @@ -1,4 +1,4 @@ -From b5b06750f1956bfa1a74efeaa6f68bcc0e0b26b5 Mon Sep 17 00:00:00 2001 +From 50c55198f8c72c73029453ba0bcb0e1cd828fe73 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder @@ -19,10 +19,10 @@ index fcbf8a2..b52e5c5 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2817191..c4f0e68 100644 +index 9669389..ce087eb 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -427,7 +427,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -428,7 +428,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { int l; BlockPosition blockposition; diff --git a/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch index 8f8b5eed66..77588697d8 100644 --- a/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch @@ -1,4 +1,4 @@ -From 524b919f7729b5f39111e2ff26f2aab3c43e46c3 Mon Sep 17 00:00:00 2001 +From 3f4a3864863d7b9d51a39ef674285fcf1a2696e1 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow @@ -19,10 +19,10 @@ index b52e5c5..a6afdd3 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c4f0e68..52b70e7 100644 +index ce087eb..ac8dc5f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -450,7 +450,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -451,7 +451,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { } this.methodProfiler.c("iceandsnow"); diff --git a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch index faad034b46..dff5ddcc9b 100644 --- a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From 1f1a23cdb676e0278f516e3a4cde83467aa54a07 Mon Sep 17 00:00:00 2001 +From 953598e8f144a0fe01042ac29cfe4a9b5e914616 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities @@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1bc7338..ac10fec 100644 +index e16a4d2..a853156 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2265,7 +2265,7 @@ public abstract class Entity implements ICommandListener { +@@ -2268,7 +2268,7 @@ public abstract class Entity implements ICommandListener { } public Entity teleportTo(Location exit, boolean portal) { diff --git a/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch index cd7f697393..18b02d34df 100644 --- a/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,4 +1,4 @@ -From f956cdf7c0c12d09a95d78745f88a0a884771142 Mon Sep 17 00:00:00 2001 +From 4d062dbe2088771c29d59322d7386cc77d045b5a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses @@ -19,10 +19,10 @@ index 9cce672..d92ccc7 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 696f659..564ef79 100644 +index ac8dc5f..39ed0d5 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -435,7 +435,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -436,7 +436,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (this.isRainingAt(blockposition)) { DifficultyDamageScaler difficultydamagescaler = this.D(blockposition); diff --git a/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch index 1b195727b1..f56149b02b 100644 --- a/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch +++ b/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch @@ -1,4 +1,4 @@ -From 982998dd8173683b1421ad89314de7661077d332 Mon Sep 17 00:00:00 2001 +From 891b22e04fed34d3d01c8c5d7c0aabbe21bef5eb Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone @@ -25,7 +25,7 @@ index d92ccc7..298c48f 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bfb30d9..1f12ff5 100644 +index df48212..3715438 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess { @@ -38,7 +38,7 @@ index bfb30d9..1f12ff5 100644 this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 564ef79..5bf7df7 100644 +index 39ed0d5..f969d2a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; @@ -49,7 +49,7 @@ index 564ef79..5bf7df7 100644 private final MinecraftServer server; public EntityTracker tracker; private final PlayerChunkMap manager; -@@ -726,6 +727,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -727,6 +728,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) { try { @@ -57,7 +57,7 @@ index 564ef79..5bf7df7 100644 iblockdata.getBlock().b((World) this, nextticklistentry.a, iblockdata, this.random); } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Exception while ticking a block"); -@@ -733,7 +735,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -734,7 +736,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { CrashReportSystemDetails.a(crashreportsystemdetails, nextticklistentry.a, iblockdata); throw new ReportedException(crashreport); diff --git a/Spigot-Server-Patches/0124-Arrow-pickup-rule-API.patch b/Spigot-Server-Patches/0124-Arrow-pickup-rule-API.patch deleted file mode 100644 index 794d65b445..0000000000 --- a/Spigot-Server-Patches/0124-Arrow-pickup-rule-API.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1cc69c3985cea7741cb7d81473f906d4893cdabd Mon Sep 17 00:00:00 2001 -From: Jedediah Smith -Date: Fri, 4 Mar 2016 03:16:11 -0500 -Subject: [PATCH] Arrow pickup rule API - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -index 2a3482c..fbf289f 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -@@ -72,6 +72,44 @@ public class CraftArrow extends AbstractProjectile implements Arrow { - getHandle().shooter = ((CraftLivingEntity) shooter).getHandle(); - } - -+ // Paper start -+ @Override -+ public PickupRule getPickupRule() { -+ return convertPickupRule(this.getHandle().fromPlayer); -+ } -+ -+ @Override -+ public void setPickupRule(PickupRule rule) { -+ this.getHandle().fromPlayer = convertPickupRule(rule); -+ } -+ -+ public static PickupRule convertPickupRule(EntityArrow.PickupStatus nms) { -+ switch (nms) { -+ case DISALLOWED: -+ return PickupRule.DISALLOWED; -+ case ALLOWED: -+ return PickupRule.ALLOWED; -+ case CREATIVE_ONLY: -+ return PickupRule.CREATIVE_ONLY; -+ default: -+ throw new IllegalStateException(); -+ } -+ } -+ -+ public static EntityArrow.PickupStatus convertPickupRule(PickupRule bukkit) { -+ switch (bukkit) { -+ case DISALLOWED: -+ return EntityArrow.PickupStatus.DISALLOWED; -+ case ALLOWED: -+ return EntityArrow.PickupStatus.ALLOWED; -+ case CREATIVE_ONLY: -+ return EntityArrow.PickupStatus.CREATIVE_ONLY; -+ default: -+ throw new IllegalStateException(); -+ } -+ } -+ // Paper end -+ - // Spigot start - private final Arrow.Spigot spigot = new Arrow.Spigot() - { --- -2.9.3 - diff --git a/Spigot-Server-Patches/0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch similarity index 97% rename from Spigot-Server-Patches/0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch rename to Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch index b83351d05e..e27500a5d9 100644 --- a/Spigot-Server-Patches/0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch +++ b/Spigot-Server-Patches/0124-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch @@ -1,4 +1,4 @@ -From 7f9704dfc3e3def3783e4822abc1127c909bacee Mon Sep 17 00:00:00 2001 +From c4e48dfab5565e8f6e68fec800d15b000c5e40d4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 24 Apr 2016 19:49:33 -0500 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement diff --git a/Spigot-Server-Patches/0126-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch similarity index 98% rename from Spigot-Server-Patches/0126-Improve-Minecraft-Hopper-Performance.patch rename to Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch index d0c368583f..b04cdca2b7 100644 --- a/Spigot-Server-Patches/0126-Improve-Minecraft-Hopper-Performance.patch +++ b/Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch @@ -1,4 +1,4 @@ -From 4dd03e3a236df339d97178a263a89bbdc28880f8 Mon Sep 17 00:00:00 2001 +From 2e48e52f960cdd8ff85cb64cc0c50b7f44d4eff0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Improve Minecraft Hopper Performance diff --git a/Spigot-Server-Patches/0127-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch similarity index 96% rename from Spigot-Server-Patches/0127-remove-null-possibility-for-getServer-singleton.patch rename to Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch index 481c38835a..dd42c424f7 100644 --- a/Spigot-Server-Patches/0127-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0126-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From 88c4726b6ae7c27b7abc04fd43f04540e9609cd1 Mon Sep 17 00:00:00 2001 +From 0196e4e2f059d3adacb627a7647e84fcb3898fa0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton diff --git a/Spigot-Server-Patches/0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 98% rename from Spigot-Server-Patches/0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 28ab072906..27c94a07a3 100644 --- a/Spigot-Server-Patches/0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0127-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From 6ac78857e5e9c4a35ad096e2d1645444f2f2087a Mon Sep 17 00:00:00 2001 +From 30b393ec80969343be6ee7461d490f38f1c1cad9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes @@ -48,7 +48,7 @@ index f542bf4..fbda70a 100644 Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1acb963..ba0e0ef 100644 +index 2a23e29..651ab32 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1217,6 +1217,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0129-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 99% rename from Spigot-Server-Patches/0129-LootTable-API-Replenishable-Lootables-Feature.patch rename to Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch index 9a7ccfca0a..bf534de0bc 100644 --- a/Spigot-Server-Patches/0129-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From f15c9bc823d678e12c8135c4b792e071093e56de Mon Sep 17 00:00:00 2001 +From e2f1cdfbc94d11d1995fab5d6e5a029b9812e882 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature @@ -713,7 +713,7 @@ index b7a04bd..5d4a551 100644 public CraftHopper(final Block block) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java -index 8a7ce92..02f56bc 100644 +index 8a7ce92b..02f56bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0130-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch similarity index 92% rename from Spigot-Server-Patches/0130-Do-not-load-chunks-for-pathfinding.patch rename to Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch index 950276ce27..2b3c3f4b88 100644 --- a/Spigot-Server-Patches/0130-Do-not-load-chunks-for-pathfinding.patch +++ b/Spigot-Server-Patches/0129-Do-not-load-chunks-for-pathfinding.patch @@ -1,4 +1,4 @@ -From 6c7b98de5dda2d3970e51bedebf78f4d90d0ef01 Mon Sep 17 00:00:00 2001 +From 1cc9fdf9a478f98633fb29dfb3250d16d95e00b8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Jan 2016 00:13:19 -0500 Subject: [PATCH] Do not load chunks for pathfinding diff --git a/Spigot-Server-Patches/0131-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch similarity index 97% rename from Spigot-Server-Patches/0131-Entity-Tracking-Improvements.patch rename to Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch index 3a8c915cd3..1d9d38093d 100644 --- a/Spigot-Server-Patches/0131-Entity-Tracking-Improvements.patch +++ b/Spigot-Server-Patches/0130-Entity-Tracking-Improvements.patch @@ -1,4 +1,4 @@ -From d397fc54e728d690037c3473cc6cedf0deca9602 Mon Sep 17 00:00:00 2001 +From 410209083b060291fb23615857551f108eaa48ea Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Jun 2013 01:24:00 -0400 Subject: [PATCH] Entity Tracking Improvements @@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player, send all passenger/vehicles to the player in the chain. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0818ff8..44c5a25 100644 +index d4fbc3c..340c24b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -53,6 +53,7 @@ public abstract class Entity implements ICommandListener { diff --git a/Spigot-Server-Patches/0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 96% rename from Spigot-Server-Patches/0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index 97d232f18e..edd6d02abb 100644 --- a/Spigot-Server-Patches/0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,4 +1,4 @@ -From dc76d4eb236cf0021c1e8bffabf83bd8fef04278 Mon Sep 17 00:00:00 2001 +From 581e3986dc0ec5a6f0c110ca00a2c6c91c0f0c80 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 May 2016 23:33:08 -0400 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat diff --git a/Spigot-Server-Patches/0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch similarity index 97% rename from Spigot-Server-Patches/0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch rename to Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch index 0703550bda..9eb282fd6e 100644 --- a/Spigot-Server-Patches/0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch +++ b/Spigot-Server-Patches/0132-Do-not-mark-chunks-as-active-for-neighbor-updates.patch @@ -1,4 +1,4 @@ -From 8a7aa0cf58365163b57b6a49683f75a4eed1ae1c Mon Sep 17 00:00:00 2001 +From b55a223ea8b714bb05ddbd0840ab53436d3095a5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 01:55:17 -0400 Subject: [PATCH] Do not mark chunks as active for neighbor updates diff --git a/Spigot-Server-Patches/0134-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch similarity index 96% rename from Spigot-Server-Patches/0134-Fix-Chunk-Unload-Queue-Issues.patch rename to Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch index cef08987fe..3f0029b98c 100644 --- a/Spigot-Server-Patches/0134-Fix-Chunk-Unload-Queue-Issues.patch +++ b/Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch @@ -1,4 +1,4 @@ -From 790ff356da80906c321cf7a7058d29f5dfe65082 Mon Sep 17 00:00:00 2001 +From 88f9bcff3f3916cfba9333816ff90e3c8050637d Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 02:03:56 -0400 Subject: [PATCH] Fix Chunk Unload Queue Issues diff --git a/Spigot-Server-Patches/0135-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch similarity index 90% rename from Spigot-Server-Patches/0135-System-property-for-disabling-watchdoge.patch rename to Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch index 8cc2a22ed2..cf998a681f 100644 --- a/Spigot-Server-Patches/0135-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0134-System-property-for-disabling-watchdoge.patch @@ -1,11 +1,11 @@ -From f07d7d4911d659540e0174f02c98be3005f84f1e Mon Sep 17 00:00:00 2001 +From bf0d781642cb2333a16b7025e3c8ae7fb74c1600 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 12 May 2016 23:02:58 -0500 Subject: [PATCH] System property for disabling watchdoge diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 3ed983c..fb57e0d 100644 +index 6384d50..cb1fcf0 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -52,7 +52,7 @@ public class WatchdogThread extends Thread diff --git a/Spigot-Server-Patches/0136-Optimize-EAR.patch b/Spigot-Server-Patches/0135-Optimize-EAR.patch similarity index 97% rename from Spigot-Server-Patches/0136-Optimize-EAR.patch rename to Spigot-Server-Patches/0135-Optimize-EAR.patch index ad96cee470..f35245c87e 100644 --- a/Spigot-Server-Patches/0136-Optimize-EAR.patch +++ b/Spigot-Server-Patches/0135-Optimize-EAR.patch @@ -1,4 +1,4 @@ -From 8b846e4c369abaf8617f908ab09db22382f4fc9d Mon Sep 17 00:00:00 2001 +From adc2e141ef85f2b1b0820981860ca7e48fe35f01 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Optimize EAR diff --git a/Spigot-Server-Patches/0137-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch similarity index 98% rename from Spigot-Server-Patches/0137-Optimize-UserCache-Thread-Safe.patch rename to Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch index 31a6c303a4..8cae88bbc6 100644 --- a/Spigot-Server-Patches/0137-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0136-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From a7a9c17fd6c4c91cb850a84a011ec9526033280a Mon Sep 17 00:00:00 2001 +From 96eb4bf4c891c95001f255a538ae3156e1996ca8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe diff --git a/Spigot-Server-Patches/0138-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch similarity index 97% rename from Spigot-Server-Patches/0138-Avoid-blocking-on-Network-Manager-creation.patch rename to Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch index 90e77677fa..13e9c8cbf2 100644 --- a/Spigot-Server-Patches/0138-Avoid-blocking-on-Network-Manager-creation.patch +++ b/Spigot-Server-Patches/0137-Avoid-blocking-on-Network-Manager-creation.patch @@ -1,4 +1,4 @@ -From e24671031ec89855f269a9fabf0f6989e172a6aa Mon Sep 17 00:00:00 2001 +From c7a2fa790e51dd5507b79a68f11de7e7e9c0228d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation diff --git a/Spigot-Server-Patches/0139-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch similarity index 99% rename from Spigot-Server-Patches/0139-Optional-old-TNT-cannon-behaviors.patch rename to Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch index 596b72ab57..fa0dd9881a 100644 --- a/Spigot-Server-Patches/0139-Optional-old-TNT-cannon-behaviors.patch +++ b/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch @@ -1,4 +1,4 @@ -From 593b506b40495839f284fb7c939abb56d4e66ef7 Mon Sep 17 00:00:00 2001 +From 7136c91dd498d1b5e956f2fdf7c53b7abfc1b924 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional old TNT cannon behaviors @@ -207,7 +207,7 @@ index dbfb8ab..537408a 100644 world.getServer().getPluginManager().callEvent(event); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 44c5a25..fc43007 100644 +index 340c24b..b2234d9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1041,6 +1041,12 @@ public abstract class Entity implements ICommandListener { @@ -248,7 +248,7 @@ index 44c5a25..fc43007 100644 this.motX += d0; this.motY += d1; this.motZ += d2; -@@ -2453,6 +2470,12 @@ public abstract class Entity implements ICommandListener { +@@ -2456,6 +2473,12 @@ public abstract class Entity implements ICommandListener { } public boolean bg() { diff --git a/Spigot-Server-Patches/0140-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch similarity index 96% rename from Spigot-Server-Patches/0140-Faster-redstone-torch-rapid-clock-removal.patch rename to Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch index f73329dafe..1cd0047395 100644 --- a/Spigot-Server-Patches/0140-Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/0139-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From 2da62ee6e370139908a266eee83f36fea8514d38 Mon Sep 17 00:00:00 2001 +From 7c1b976cb4154ced9c6052b9f191549330636a4f Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Mon, 23 May 2016 12:12:37 +0200 Subject: [PATCH] Faster redstone torch rapid clock removal diff --git a/Spigot-Server-Patches/0141-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch similarity index 97% rename from Spigot-Server-Patches/0141-Ensure-Chunks-never-ever-load-async.patch rename to Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch index 3fc84731e9..578c520aef 100644 --- a/Spigot-Server-Patches/0141-Ensure-Chunks-never-ever-load-async.patch +++ b/Spigot-Server-Patches/0140-Ensure-Chunks-never-ever-load-async.patch @@ -1,4 +1,4 @@ -From c066f205180636aecbdbd04e680309b520fdeb66 Mon Sep 17 00:00:00 2001 +From 79f02a4a6ba06509cc09747cc68ff538db6d9a80 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 27 May 2016 21:41:26 -0400 Subject: [PATCH] Ensure Chunks never ever load async diff --git a/Spigot-Server-Patches/0142-Add-server-name-parameter.patch b/Spigot-Server-Patches/0141-Add-server-name-parameter.patch similarity index 90% rename from Spigot-Server-Patches/0142-Add-server-name-parameter.patch rename to Spigot-Server-Patches/0141-Add-server-name-parameter.patch index cde69b10ac..175d1f2eb8 100644 --- a/Spigot-Server-Patches/0142-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0141-Add-server-name-parameter.patch @@ -1,11 +1,11 @@ -From 6514a06e74bd0149b5eaa764b8d865bf7a5f524f Mon Sep 17 00:00:00 2001 +From 774f095fbb45ffd6bee6fc48044376b5f2086437 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Sat, 28 May 2016 16:54:03 +0200 Subject: [PATCH] Add server-name parameter diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 2cafdb8..5992196 100644 +index 788bf66..4ac4e6f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -134,6 +134,14 @@ public class Main { diff --git a/Spigot-Server-Patches/0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch similarity index 97% rename from Spigot-Server-Patches/0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch rename to Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index 77a71d6caa..529ef70548 100644 --- a/Spigot-Server-Patches/0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0142-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From a9df4a6ded94b42daabf4caa275f1863ea6dd1f5 Mon Sep 17 00:00:00 2001 +From 46d08dc68f5afa04850e55a0cffa4c9756d3b51a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 May 2016 22:53:50 -0400 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world diff --git a/Spigot-Server-Patches/0144-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch similarity index 98% rename from Spigot-Server-Patches/0144-Fix-FallingBlocks-being-stuck-on-fences.patch rename to Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch index 65acbd115d..83fb6dabcd 100644 --- a/Spigot-Server-Patches/0144-Fix-FallingBlocks-being-stuck-on-fences.patch +++ b/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch @@ -1,4 +1,4 @@ -From da5dea9abb232acfaa7f6c5ced06548b48e28a6e Mon Sep 17 00:00:00 2001 +From c4405c93da55c2ee40052894c0cedb2d7e0241bb Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Fri, 3 Jun 2016 23:13:39 +0200 Subject: [PATCH] Fix FallingBlocks being stuck on fences diff --git a/Spigot-Server-Patches/0145-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch similarity index 99% rename from Spigot-Server-Patches/0145-Make-entities-look-for-hoppers.patch rename to Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch index ec312de05d..97ac437e42 100644 --- a/Spigot-Server-Patches/0145-Make-entities-look-for-hoppers.patch +++ b/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch @@ -1,4 +1,4 @@ -From 549a6b4f967073188eb89913933ab995717136b1 Mon Sep 17 00:00:00 2001 +From 7926e2d31862d9611ebab6d4ea49ed229f39398b Mon Sep 17 00:00:00 2001 From: Techcable Date: Sat, 18 Jun 2016 01:01:37 -0500 Subject: [PATCH] Make entities look for hoppers @@ -144,7 +144,7 @@ index 008ed20..b3c1f55 100644 this.b = i; this.c = j; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fc43007..b2fd599 100644 +index b2234d9..a3685ec 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -80,6 +80,19 @@ public abstract class Entity implements ICommandListener { diff --git a/Spigot-Server-Patches/0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 99% rename from Spigot-Server-Patches/0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 0f170b09b5..5735d4ba6a 100644 --- a/Spigot-Server-Patches/0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 8f1616ef8eb8f326fb8b051afe4dee656464f926 Mon Sep 17 00:00:00 2001 +From 805d931e0371a7a349240c4430923f5f77fb4cca Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement diff --git a/Spigot-Server-Patches/0147-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch similarity index 95% rename from Spigot-Server-Patches/0147-Toggleable-Elytra-Wall-Damage.patch rename to Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch index a0dab8d3f6..ab127fffb5 100644 --- a/Spigot-Server-Patches/0147-Toggleable-Elytra-Wall-Damage.patch +++ b/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch @@ -1,4 +1,4 @@ -From de55be17f455d2b265e3a81aa8217cc42293fe52 Mon Sep 17 00:00:00 2001 +From a71d9adaff274d42ba791d20c656153d8d187aa5 Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Sat, 18 Jun 2016 23:13:59 -0700 Subject: [PATCH] Toggleable Elytra Wall Damage @@ -21,7 +21,7 @@ index cda516f..965edc9 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 88bc7d8..7ebdb30 100644 +index 52b48ad..4ec6bc9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1690,6 +1690,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0148-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch similarity index 95% rename from Spigot-Server-Patches/0148-Fix-Double-World-Add-issues.patch rename to Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch index 7980fd4d99..a55775e209 100644 --- a/Spigot-Server-Patches/0148-Fix-Double-World-Add-issues.patch +++ b/Spigot-Server-Patches/0147-Fix-Double-World-Add-issues.patch @@ -1,4 +1,4 @@ -From d807efe6bf06f9b91e4571e155548a2341fa0be9 Mon Sep 17 00:00:00 2001 +From 985952221532bab551cae422a725f133de11dd84 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Jun 2016 22:54:34 -0400 Subject: [PATCH] Fix Double World Add issues @@ -21,7 +21,7 @@ index 310ab96..1941121 100644 Iterator iterator = entity.bx().iterator(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ba0e0ef..49351c8 100644 +index 651ab32..ae1edb0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1098,6 +1098,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0149-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0148-Fix-Old-Sign-Conversion.patch similarity index 98% rename from Spigot-Server-Patches/0149-Fix-Old-Sign-Conversion.patch rename to Spigot-Server-Patches/0148-Fix-Old-Sign-Conversion.patch index db7bdfc3d8..65faf5e56a 100644 --- a/Spigot-Server-Patches/0149-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0148-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From 4d9a35fbfa7429023a065e7c18fa8470532f09d0 Mon Sep 17 00:00:00 2001 +From 9f815a6fe05004cce263fbba75560f027ed567d2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion diff --git a/Spigot-Server-Patches/0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 93% rename from Spigot-Server-Patches/0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index e134612bdd..5ec2bcdb65 100644 --- a/Spigot-Server-Patches/0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/Spigot-Server-Patches/0149-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -1,4 +1,4 @@ -From a3db6537bf6a941533e53397ac7f50f8a488a65d Mon Sep 17 00:00:00 2001 +From adff16d07abcbe250ff393a019a98d260e69fef0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 16 Jul 2016 19:11:17 -0500 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name diff --git a/Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch similarity index 91% rename from Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch rename to Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch index 7312948e1a..c2eb945019 100644 --- a/Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch +++ b/Spigot-Server-Patches/0150-More-informative-vehicle-moved-wrongly-message.patch @@ -1,11 +1,11 @@ -From 243754b72dd8eee923da1e83577624b99b2ee39e Mon Sep 17 00:00:00 2001 +From 0bb7eaad940190ff5281172ebfdc2a54593e6f6b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Jul 2016 17:58:53 -0500 Subject: [PATCH] More informative vehicle moved wrongly message diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 845c2fb..6cecbe9 100644 +index f3876f6..968c039 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -342,7 +342,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch similarity index 94% rename from Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch rename to Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch index 200c6c82c8..917bc0f2e8 100644 --- a/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0151-Re-track-players-that-dismount-from-other-players.patch @@ -1,4 +1,4 @@ -From 8999e61b98f3d5d75ab3b7c7425b4d5674cd9803 Mon Sep 17 00:00:00 2001 +From 9867dc6a07fb53c3bb37d274d0138d04b84580b6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Jul 2016 16:33:03 -0500 Subject: [PATCH] Re-track players that dismount from other players diff --git a/Spigot-Server-Patches/0153-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch similarity index 97% rename from Spigot-Server-Patches/0153-Add-setting-for-proxy-online-mode-status.patch rename to Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch index d4773ac1cb..ee2d18480b 100644 --- a/Spigot-Server-Patches/0153-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch @@ -1,4 +1,4 @@ -From 5ca24b601302ac12f630371e02174789f3310fbf Mon Sep 17 00:00:00 2001 +From 5a14f84b25e0316aaac5ca28325a20ad965a41b1 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 5 Aug 2016 01:03:08 +0200 Subject: [PATCH] Add setting for proxy online mode status diff --git a/Spigot-Server-Patches/0154-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch similarity index 97% rename from Spigot-Server-Patches/0154-Optimise-BlockStateEnum-hashCode-and-equals.patch rename to Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch index 89e1c4dcbe..969b95ee4a 100644 --- a/Spigot-Server-Patches/0154-Optimise-BlockStateEnum-hashCode-and-equals.patch +++ b/Spigot-Server-Patches/0153-Optimise-BlockStateEnum-hashCode-and-equals.patch @@ -1,4 +1,4 @@ -From cf7289da0dd5c5e7e02f8a0f0ef6eab4f0c3d037 Mon Sep 17 00:00:00 2001 +From 916d7c2c15e2de6a47e69b0f6ee3a22c54afcfc8 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 19 Aug 2016 01:52:56 +0100 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals diff --git a/Spigot-Server-Patches/0155-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch similarity index 94% rename from Spigot-Server-Patches/0155-Disable-ticking-of-snow-blocks.patch rename to Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch index 0f5adafac2..7f7d278d09 100644 --- a/Spigot-Server-Patches/0155-Disable-ticking-of-snow-blocks.patch +++ b/Spigot-Server-Patches/0154-Disable-ticking-of-snow-blocks.patch @@ -1,4 +1,4 @@ -From fc6639062e9afb2c604d2d60fa7e85051b3d100e Mon Sep 17 00:00:00 2001 +From 6bff5130a0838566555545d8ecd62b3eaef7a1e5 Mon Sep 17 00:00:00 2001 From: killme Date: Tue, 30 Aug 2016 16:39:48 +0200 Subject: [PATCH] Disable ticking of snow blocks diff --git a/Spigot-Server-Patches/0156-Convert-new-health-to-a-float-during-set.patch b/Spigot-Server-Patches/0155-Convert-new-health-to-a-float-during-set.patch similarity index 94% rename from Spigot-Server-Patches/0156-Convert-new-health-to-a-float-during-set.patch rename to Spigot-Server-Patches/0155-Convert-new-health-to-a-float-during-set.patch index 098f1c0af5..d47cbfcbbb 100644 --- a/Spigot-Server-Patches/0156-Convert-new-health-to-a-float-during-set.patch +++ b/Spigot-Server-Patches/0155-Convert-new-health-to-a-float-during-set.patch @@ -1,4 +1,4 @@ -From 0e4a24c077e44e5ef89ad18ff160824a0da98423 Mon Sep 17 00:00:00 2001 +From bcdd19f402a03724ce08447a8949176b0d0fbeab Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 1 Sep 2016 09:51:31 +0000 Subject: [PATCH] Convert new health to a float during set diff --git a/Spigot-Server-Patches/0157-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0156-Fix-AIOOBE-in-inventory-handling.patch similarity index 91% rename from Spigot-Server-Patches/0157-Fix-AIOOBE-in-inventory-handling.patch rename to Spigot-Server-Patches/0156-Fix-AIOOBE-in-inventory-handling.patch index 50a2f82c81..fefa718082 100644 --- a/Spigot-Server-Patches/0157-Fix-AIOOBE-in-inventory-handling.patch +++ b/Spigot-Server-Patches/0156-Fix-AIOOBE-in-inventory-handling.patch @@ -1,11 +1,11 @@ -From 2d42826c205c5d09f44e5f61c803a819e417fbec Mon Sep 17 00:00:00 2001 +From 57b5fcc7936abe190f99e1d2a7c9cf6598285a60 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sun, 4 Sep 2016 16:35:43 -0500 Subject: [PATCH] Fix AIOOBE in inventory handling diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6cecbe9..d6f73e5 100644 +index 968c039..6c73e9a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1800,7 +1800,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0158-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0157-Configurable-packet-in-spam-threshold.patch similarity index 96% rename from Spigot-Server-Patches/0158-Configurable-packet-in-spam-threshold.patch rename to Spigot-Server-Patches/0157-Configurable-packet-in-spam-threshold.patch index ba205197a2..2882079bef 100644 --- a/Spigot-Server-Patches/0158-Configurable-packet-in-spam-threshold.patch +++ b/Spigot-Server-Patches/0157-Configurable-packet-in-spam-threshold.patch @@ -1,4 +1,4 @@ -From cef88375344db90e9925bba72c3b6ac74941422c Mon Sep 17 00:00:00 2001 +From 9da6c289b144172ee1a8db3e63f9b2e24e1fa7f4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 11 Sep 2016 14:30:57 -0500 Subject: [PATCH] Configurable packet in spam threshold @@ -23,7 +23,7 @@ index b1aa228..3f5b482 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index d6f73e5..abd94bc 100644 +index 6c73e9a..2014714 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -862,13 +862,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0159-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0158-Configurable-flying-kick-messages.patch similarity index 96% rename from Spigot-Server-Patches/0159-Configurable-flying-kick-messages.patch rename to Spigot-Server-Patches/0158-Configurable-flying-kick-messages.patch index fd16a98abf..019431b837 100644 --- a/Spigot-Server-Patches/0159-Configurable-flying-kick-messages.patch +++ b/Spigot-Server-Patches/0158-Configurable-flying-kick-messages.patch @@ -1,4 +1,4 @@ -From c36c838501c56fc6fa4701f255d7533c9acb703f Mon Sep 17 00:00:00 2001 +From e8480741ede4c7cc74e90f39a4e6b9c40438f034 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 20 Sep 2016 00:58:01 +0000 Subject: [PATCH] Configurable flying kick messages @@ -21,7 +21,7 @@ index 3f5b482..7018828 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index abd94bc..2a1b2cc 100644 +index 2014714..30726ae 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -142,7 +142,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0160-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0159-Auto-Save-Improvements.patch similarity index 97% rename from Spigot-Server-Patches/0160-Auto-Save-Improvements.patch rename to Spigot-Server-Patches/0159-Auto-Save-Improvements.patch index 67d06bca6d..cf1e9d369d 100644 --- a/Spigot-Server-Patches/0160-Auto-Save-Improvements.patch +++ b/Spigot-Server-Patches/0159-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From 296081bf03b9bc981daf2e992caca68314ad4a17 Mon Sep 17 00:00:00 2001 +From ec543c4631be849db42ba3150c4d686f72d55b26 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Sep 2016 23:16:39 -0400 Subject: [PATCH] Auto Save Improvements @@ -155,7 +155,7 @@ index b3e0ef7..9cdcdc4 100644 this.methodProfiler.a("tallying"); this.h[this.ticks % 100] = System.nanoTime() - i; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index b14d4cb..2f527f6 100644 +index be67df0..f675a70 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -330,6 +330,7 @@ public abstract class PlayerList { @@ -192,10 +192,10 @@ index b14d4cb..2f527f6 100644 public void addWhitelist(GameProfile gameprofile) { this.whitelist.add(new WhiteListEntry(gameprofile)); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5bf7df7..bfa87d7 100644 +index f969d2a..cc0e8d2 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1002,8 +1002,9 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1003,8 +1003,9 @@ public class WorldServer extends World implements IAsyncTaskHandler { ChunkProviderServer chunkproviderserver = this.getChunkProviderServer(); if (chunkproviderserver.e()) { @@ -206,7 +206,7 @@ index 5bf7df7..bfa87d7 100644 if (iprogressupdate != null) { iprogressupdate.a("Saving level"); } -@@ -1012,6 +1013,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1013,6 +1014,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (iprogressupdate != null) { iprogressupdate.c("Saving chunks"); } diff --git a/Spigot-Server-Patches/0161-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0160-Chunk-registration-fixes.patch similarity index 91% rename from Spigot-Server-Patches/0161-Chunk-registration-fixes.patch rename to Spigot-Server-Patches/0160-Chunk-registration-fixes.patch index fdeb5e0099..31242af7e1 100644 --- a/Spigot-Server-Patches/0161-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0160-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From c641b6d0c9afd8a12ef3047d33ef9257335c6eaf Mon Sep 17 00:00:00 2001 +From ce2c2cae65762b4782f85dca2ac33ba4ed8d6204 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 22:54:28 -0400 Subject: [PATCH] Chunk registration fixes @@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr Keep them consistent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 49351c8..a9e25d5 100644 +index ae1edb0..ee3f14c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1760,7 +1760,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0162-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0161-Remove-FishingHook-reference-on-Craft-Entity-removal.patch similarity index 93% rename from Spigot-Server-Patches/0162-Remove-FishingHook-reference-on-Craft-Entity-removal.patch rename to Spigot-Server-Patches/0161-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index 7640e70e4c..bdf3d2c0e5 100644 --- a/Spigot-Server-Patches/0162-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0161-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -1,4 +1,4 @@ -From 8bf43afb65cb7a9a15616cdc1cd9ce1e97a8e08b Mon Sep 17 00:00:00 2001 +From 76fc1946fe7c0e3be45fba0abfbe8db79f38ab23 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 16 Jun 2016 00:17:23 -0400 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal diff --git a/Spigot-Server-Patches/0163-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0162-Auto-fix-bad-Y-levels-on-player-login.patch similarity index 92% rename from Spigot-Server-Patches/0163-Auto-fix-bad-Y-levels-on-player-login.patch rename to Spigot-Server-Patches/0162-Auto-fix-bad-Y-levels-on-player-login.patch index 0ffd51fe37..6209bc6baf 100644 --- a/Spigot-Server-Patches/0163-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0162-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From e2e97246b82c9879582fcee0c284e3c7297e9f5a Mon Sep 17 00:00:00 2001 +From 88353ade21124a255a37c70cb1adf5aba64d9de1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:48:39 -0400 Subject: [PATCH] Auto fix bad Y levels on player login diff --git a/Spigot-Server-Patches/0164-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0163-Raise-string-limit-for-packet-serialization.patch similarity index 95% rename from Spigot-Server-Patches/0164-Raise-string-limit-for-packet-serialization.patch rename to Spigot-Server-Patches/0163-Raise-string-limit-for-packet-serialization.patch index 25343d41e7..954389d6ce 100644 --- a/Spigot-Server-Patches/0164-Raise-string-limit-for-packet-serialization.patch +++ b/Spigot-Server-Patches/0163-Raise-string-limit-for-packet-serialization.patch @@ -1,4 +1,4 @@ -From 1694ca577a1e9873bca5a85bb5a4d60e061ffe80 Mon Sep 17 00:00:00 2001 +From e07c5baeb6d4035cdad4090fa6832735a4fd3a96 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:54:20 -0400 Subject: [PATCH] Raise string limit for packet serialization diff --git a/Spigot-Server-Patches/0165-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0164-Disable-Vanilla-Chunk-GC.patch similarity index 83% rename from Spigot-Server-Patches/0165-Disable-Vanilla-Chunk-GC.patch rename to Spigot-Server-Patches/0164-Disable-Vanilla-Chunk-GC.patch index c03ee6fddd..9b94c4665c 100644 --- a/Spigot-Server-Patches/0165-Disable-Vanilla-Chunk-GC.patch +++ b/Spigot-Server-Patches/0164-Disable-Vanilla-Chunk-GC.patch @@ -1,4 +1,4 @@ -From ba555f353d7330a33b75aeb1852b0095a123234b Mon Sep 17 00:00:00 2001 +From 0305bd7efe93f0852160268f7bf92ef288a3915e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Sep 2016 01:51:30 -0400 Subject: [PATCH] Disable Vanilla Chunk GC @@ -6,10 +6,10 @@ Subject: [PATCH] Disable Vanilla Chunk GC Bukkit has its own system for this. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index bfa87d7..be432ce 100644 +index cc0e8d2..7a6d11f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1019,7 +1019,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1020,7 +1020,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { chunkproviderserver.a(flag); timings.worldSaveChunks.stopTiming(); // Paper // CraftBukkit - ArrayList -> Collection @@ -18,7 +18,7 @@ index bfa87d7..be432ce 100644 Iterator iterator = arraylist.iterator(); while (iterator.hasNext()) { -@@ -1028,7 +1028,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1029,7 +1029,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (chunk != null && !this.manager.a(chunk.locX, chunk.locZ)) { chunkproviderserver.unload(chunk); } diff --git a/Spigot-Server-Patches/0166-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0165-Option-to-remove-corrupt-tile-entities.patch similarity index 96% rename from Spigot-Server-Patches/0166-Option-to-remove-corrupt-tile-entities.patch rename to Spigot-Server-Patches/0165-Option-to-remove-corrupt-tile-entities.patch index 1cddb466bb..f6c7b73577 100644 --- a/Spigot-Server-Patches/0166-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0165-Option-to-remove-corrupt-tile-entities.patch @@ -1,4 +1,4 @@ -From d6c0f5e3cb5b3d39dbab1d747acd1578e4dc3a26 Mon Sep 17 00:00:00 2001 +From 619a184dd43c3ac81907ea9c9a30b9a71c84b8be Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 5 Oct 2016 16:27:36 -0500 Subject: [PATCH] Option to remove corrupt tile entities diff --git a/Spigot-Server-Patches/0167-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0166-Add-EntityZapEvent.patch similarity index 98% rename from Spigot-Server-Patches/0167-Add-EntityZapEvent.patch rename to Spigot-Server-Patches/0166-Add-EntityZapEvent.patch index 1c8a975dcd..12828edb0f 100644 --- a/Spigot-Server-Patches/0167-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0166-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From f8ce13e1140c6dac827d140c68c31d46233a9baa Mon Sep 17 00:00:00 2001 +From 7bc75b32c14bfe88a4f0c1ffd8bcf9b1fb86da63 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent diff --git a/Spigot-Server-Patches/0168-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0167-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 96% rename from Spigot-Server-Patches/0168-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to Spigot-Server-Patches/0167-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index 12a4440ba6..bf530a3640 100644 --- a/Spigot-Server-Patches/0168-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/Spigot-Server-Patches/0167-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From c8fee91ae18c279ac2eb3eeb65f50304d79995ad Mon Sep 17 00:00:00 2001 +From fc58b79f9d2af4b4302702788ecf20bf61258e24 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 20:28:12 -0400 Subject: [PATCH] Don't load Chunks from Hoppers and other things diff --git a/Spigot-Server-Patches/0169-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0168-Prevent-Auto-Save-if-Save-Queue-is-full.patch similarity index 98% rename from Spigot-Server-Patches/0169-Prevent-Auto-Save-if-Save-Queue-is-full.patch rename to Spigot-Server-Patches/0168-Prevent-Auto-Save-if-Save-Queue-is-full.patch index 77924e5be0..abed6c63fd 100644 --- a/Spigot-Server-Patches/0169-Prevent-Auto-Save-if-Save-Queue-is-full.patch +++ b/Spigot-Server-Patches/0168-Prevent-Auto-Save-if-Save-Queue-is-full.patch @@ -1,4 +1,4 @@ -From f34caf16821f5e00ca9716d85a1e4cfa4610672c Mon Sep 17 00:00:00 2001 +From dfab41eff8e54d14bb9fabe871e924425e1bc227 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 21:52:22 -0400 Subject: [PATCH] Prevent Auto Save if Save Queue is full diff --git a/Spigot-Server-Patches/0170-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0169-Chunk-Save-Stats-Debug-Option.patch similarity index 98% rename from Spigot-Server-Patches/0170-Chunk-Save-Stats-Debug-Option.patch rename to Spigot-Server-Patches/0169-Chunk-Save-Stats-Debug-Option.patch index c597993779..a3430f27f1 100644 --- a/Spigot-Server-Patches/0170-Chunk-Save-Stats-Debug-Option.patch +++ b/Spigot-Server-Patches/0169-Chunk-Save-Stats-Debug-Option.patch @@ -1,4 +1,4 @@ -From edf426b580d2f9c38b039be2283bee92e12c0238 Mon Sep 17 00:00:00 2001 +From 9a0d4eaa54333b645b373b23f47a19509515a4fd Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 4 Nov 2016 02:12:10 -0400 Subject: [PATCH] Chunk Save Stats Debug Option diff --git a/Spigot-Server-Patches/0171-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0170-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch similarity index 97% rename from Spigot-Server-Patches/0171-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch rename to Spigot-Server-Patches/0170-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index 727d80393a..def9b37bdd 100644 --- a/Spigot-Server-Patches/0171-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0170-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -1,4 +1,4 @@ -From 4932f8ade2aeff60d26d4013fb576118376efabd Mon Sep 17 00:00:00 2001 +From 40e99b788e5e633d514a07da8d71d7f8436e2c0d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Nov 2016 23:25:22 -0600 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items diff --git a/Spigot-Server-Patches/0172-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0171-Cache-user-authenticator-threads.patch similarity index 97% rename from Spigot-Server-Patches/0172-Cache-user-authenticator-threads.patch rename to Spigot-Server-Patches/0171-Cache-user-authenticator-threads.patch index 8f729703e1..03cdd70591 100644 --- a/Spigot-Server-Patches/0172-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0171-Cache-user-authenticator-threads.patch @@ -1,4 +1,4 @@ -From 5153ddc809d605d9b338d46385b5d1a4e8b74628 Mon Sep 17 00:00:00 2001 +From 00a242d15af9615b1660c6b8670f045c92879300 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads diff --git a/Spigot-Server-Patches/0173-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0172-Optimize-Network-Queue.patch similarity index 93% rename from Spigot-Server-Patches/0173-Optimize-Network-Queue.patch rename to Spigot-Server-Patches/0172-Optimize-Network-Queue.patch index 817ca0b850..6bff0a821a 100644 --- a/Spigot-Server-Patches/0173-Optimize-Network-Queue.patch +++ b/Spigot-Server-Patches/0172-Optimize-Network-Queue.patch @@ -1,4 +1,4 @@ -From 76296cae89d0c998ec6e7c4251d9a1f8e9f5ba77 Mon Sep 17 00:00:00 2001 +From c31c56f3225f88b8b9f89a0cba8b4eb6ff8d136a Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:54:56 -0500 Subject: [PATCH] Optimize Network Queue diff --git a/Spigot-Server-Patches/0174-Optimise-NetworkManager.patch b/Spigot-Server-Patches/0173-Optimise-NetworkManager.patch similarity index 98% rename from Spigot-Server-Patches/0174-Optimise-NetworkManager.patch rename to Spigot-Server-Patches/0173-Optimise-NetworkManager.patch index 4119d384af..ac9f58756f 100644 --- a/Spigot-Server-Patches/0174-Optimise-NetworkManager.patch +++ b/Spigot-Server-Patches/0173-Optimise-NetworkManager.patch @@ -1,4 +1,4 @@ -From 707d07a4f3bff13c7f04565580157ba9e699c672 Mon Sep 17 00:00:00 2001 +From 1cb36c5c43cf194e8a20138d73709b3a7714dbd4 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 20:35:05 +0000 Subject: [PATCH] Optimise NetworkManager diff --git a/Spigot-Server-Patches/0175-Optimise-removeQueue.patch b/Spigot-Server-Patches/0174-Optimise-removeQueue.patch similarity index 97% rename from Spigot-Server-Patches/0175-Optimise-removeQueue.patch rename to Spigot-Server-Patches/0174-Optimise-removeQueue.patch index b6f26d6d55..be48502b2d 100644 --- a/Spigot-Server-Patches/0175-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0174-Optimise-removeQueue.patch @@ -1,4 +1,4 @@ -From 2e1f99744ba6f577e406758d9d09dc0f7151f6e9 Mon Sep 17 00:00:00 2001 +From a3fd633088704fb8d6d6e268e5cd8317dd031335 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 13:22:40 +0000 Subject: [PATCH] Optimise removeQueue diff --git a/Spigot-Server-Patches/0176-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch similarity index 94% rename from Spigot-Server-Patches/0176-Allow-Reloading-of-Command-Aliases.patch rename to Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch index 7ac2e7724e..16c35e8430 100644 --- a/Spigot-Server-Patches/0176-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 90fc7033f2b9fb52ba2b0bb3163ce856804fdeb3 Mon Sep 17 00:00:00 2001 +From 0f9efb9581380733e92802be67bc2973c6d61905 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:21:52 -0500 Subject: [PATCH] Allow Reloading of Command Aliases diff --git a/Spigot-Server-Patches/0177-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0176-Add-source-to-PlayerExpChangeEvent.patch similarity index 97% rename from Spigot-Server-Patches/0177-Add-source-to-PlayerExpChangeEvent.patch rename to Spigot-Server-Patches/0176-Add-source-to-PlayerExpChangeEvent.patch index 3e260c3e03..f37ea28c15 100644 --- a/Spigot-Server-Patches/0177-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0176-Add-source-to-PlayerExpChangeEvent.patch @@ -1,4 +1,4 @@ -From 905ed0c76acd45fc0494d8751bdaef28b616b93b Mon Sep 17 00:00:00 2001 +From 54542ffb2fef73474028f82e4e1a012004990458 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:48:33 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/Spigot-Server-Patches/0178-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0177-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 89% rename from Spigot-Server-Patches/0178-Optimize-World.isLoaded-BlockPosition-Z.patch rename to Spigot-Server-Patches/0177-Optimize-World.isLoaded-BlockPosition-Z.patch index d1ea18e29b..3326dc871d 100644 --- a/Spigot-Server-Patches/0178-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0177-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From 997dbc64707e88261959aefd10282cd896be670b Mon Sep 17 00:00:00 2001 +From b6ce850509cf00f172494e6f8e20bfaa8a6b1057 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Dec 2016 00:11:43 -0500 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z Reduce method invocations for World.isLoaded(BlockPosition)Z diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a9e25d5..fb346c0 100644 +index ee3f14c..5ea201e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -286,7 +286,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0179-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0178-Speedup-BlockPos-by-fixing-inlining.patch similarity index 99% rename from Spigot-Server-Patches/0179-Speedup-BlockPos-by-fixing-inlining.patch rename to Spigot-Server-Patches/0178-Speedup-BlockPos-by-fixing-inlining.patch index 7b775e1f29..a002958b00 100644 --- a/Spigot-Server-Patches/0179-Speedup-BlockPos-by-fixing-inlining.patch +++ b/Spigot-Server-Patches/0178-Speedup-BlockPos-by-fixing-inlining.patch @@ -1,4 +1,4 @@ -From 68d685835cb036a595d0704ee17466dc419ab144 Mon Sep 17 00:00:00 2001 +From ffcde452891a2dec8898826d22962e2815d6d152 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 30 Nov 2016 20:56:58 -0600 Subject: [PATCH] Speedup BlockPos by fixing inlining diff --git a/Spigot-Server-Patches/0180-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0179-Don-t-let-fishinghooks-use-portals.patch similarity index 93% rename from Spigot-Server-Patches/0180-Don-t-let-fishinghooks-use-portals.patch rename to Spigot-Server-Patches/0179-Don-t-let-fishinghooks-use-portals.patch index 888fdea3f0..1a981d0134 100644 --- a/Spigot-Server-Patches/0180-Don-t-let-fishinghooks-use-portals.patch +++ b/Spigot-Server-Patches/0179-Don-t-let-fishinghooks-use-portals.patch @@ -1,11 +1,11 @@ -From 87609853bade8009dc80b9102205cd0c2c36d630 Mon Sep 17 00:00:00 2001 +From d7a249718a819f8e00a9546693f5b74596feea59 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Dec 2016 16:03:19 -0600 Subject: [PATCH] Don't let fishinghooks use portals diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b2fd599..5e3f697 100644 +index a3685ec..6656358 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -143,7 +143,7 @@ public abstract class Entity implements ICommandListener { diff --git a/Spigot-Server-Patches/0181-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch similarity index 98% rename from Spigot-Server-Patches/0181-Add-ProjectileCollideEvent.patch rename to Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch index 39829c2fb0..750e79d3e9 100644 --- a/Spigot-Server-Patches/0181-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 54fb3081b88f499e2162b13b87c28ea8eb302291 Mon Sep 17 00:00:00 2001 +From 6a73feac6bbfa2e3b3e47786f494a8ae29244081 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent diff --git a/Spigot-Server-Patches/0182-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0181-Vanished-players-don-t-have-rights.patch similarity index 97% rename from Spigot-Server-Patches/0182-Vanished-players-don-t-have-rights.patch rename to Spigot-Server-Patches/0181-Vanished-players-don-t-have-rights.patch index c8074e6045..8c517a49e5 100644 --- a/Spigot-Server-Patches/0182-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0181-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From c8b43ba2a1a1c9841516ffe14ad2d8d42bd07b0c Mon Sep 17 00:00:00 2001 +From 78754b772ed91985a032ffcf48369d4cd95fbe39 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Dec 2016 22:10:35 -0600 Subject: [PATCH] Vanished players don't have rights diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5e3f697..ea36c53 100644 +index 6656358..4582b44 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener { @@ -31,7 +31,7 @@ index eb32871..a380e61 100644 IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index fb346c0..d8c8579 100644 +index 5ea201e..fbdc450 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1796,6 +1796,33 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0183-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0182-Prevent-Pathfinding-out-of-World-Border.patch similarity index 97% rename from Spigot-Server-Patches/0183-Prevent-Pathfinding-out-of-World-Border.patch rename to Spigot-Server-Patches/0182-Prevent-Pathfinding-out-of-World-Border.patch index 23674f3d7a..726c273ef4 100644 --- a/Spigot-Server-Patches/0183-Prevent-Pathfinding-out-of-World-Border.patch +++ b/Spigot-Server-Patches/0182-Prevent-Pathfinding-out-of-World-Border.patch @@ -1,4 +1,4 @@ -From d294569a5524f4c9a3109fb2bb92a051bec19e99 Mon Sep 17 00:00:00 2001 +From 3160b608ea40ce14bc154c44bf69d2b217d565dd Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Dec 2016 23:07:42 -0500 Subject: [PATCH] Prevent Pathfinding out of World Border diff --git a/Spigot-Server-Patches/0184-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch b/Spigot-Server-Patches/0183-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch similarity index 95% rename from Spigot-Server-Patches/0184-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch rename to Spigot-Server-Patches/0183-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch index a8fce758cf..1353442de5 100644 --- a/Spigot-Server-Patches/0184-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch +++ b/Spigot-Server-Patches/0183-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch @@ -1,4 +1,4 @@ -From 7602bc325e3af639d1128709d22ce4fa5e77cd8b Mon Sep 17 00:00:00 2001 +From d6e5670a47e525658a753d478b2a90d974648c19 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Dec 2016 23:38:57 -0500 Subject: [PATCH] Ignore invalid Marker Icon ID's in maps diff --git a/Spigot-Server-Patches/0185-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0184-Bound-Treasure-Maps-to-World-Border.patch similarity index 97% rename from Spigot-Server-Patches/0185-Bound-Treasure-Maps-to-World-Border.patch rename to Spigot-Server-Patches/0184-Bound-Treasure-Maps-to-World-Border.patch index 56c4629e4d..06249a313a 100644 --- a/Spigot-Server-Patches/0185-Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/0184-Bound-Treasure-Maps-to-World-Border.patch @@ -1,4 +1,4 @@ -From fb7169e724c1bd2b2741b1c8c8114cac985d869b Mon Sep 17 00:00:00 2001 +From 509a9251303919994ac23a5c19c1c9ccefa438d3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:15:11 -0500 Subject: [PATCH] Bound Treasure Maps to World Border diff --git a/Spigot-Server-Patches/0186-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch similarity index 97% rename from Spigot-Server-Patches/0186-Configurable-Cartographer-Treasure-Maps.patch rename to Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch index 94cb6a8337..a9d40a6d15 100644 --- a/Spigot-Server-Patches/0186-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 84c4b7fa4c9253ad2cc3ab7730cad0d859ca2484 Mon Sep 17 00:00:00 2001 +From 90b756d0798fb6ebe6a641c5fdbf7b6c8ea03822 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps diff --git a/Spigot-Server-Patches/0187-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0186-Optimize-ItemStack.isEmpty.patch similarity index 95% rename from Spigot-Server-Patches/0187-Optimize-ItemStack.isEmpty.patch rename to Spigot-Server-Patches/0186-Optimize-ItemStack.isEmpty.patch index 5d97d0ea6d..3513d97817 100644 --- a/Spigot-Server-Patches/0187-Optimize-ItemStack.isEmpty.patch +++ b/Spigot-Server-Patches/0186-Optimize-ItemStack.isEmpty.patch @@ -1,4 +1,4 @@ -From 38d9d44407e334def2604249a3911d844a83bb83 Mon Sep 17 00:00:00 2001 +From 98929d730bb71757834f2cb046e93391f3c79968 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Dec 2016 03:48:29 -0500 Subject: [PATCH] Optimize ItemStack.isEmpty() diff --git a/Spigot-Server-Patches/0188-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0187-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 96% rename from Spigot-Server-Patches/0188-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to Spigot-Server-Patches/0187-Add-API-methods-to-control-if-armour-stands-can-move.patch index f71279aa44..0351ee34de 100644 --- a/Spigot-Server-Patches/0188-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0187-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,4 +1,4 @@ -From 1753ce933e330dbf629b2909d17223dbdf94470b Mon Sep 17 00:00:00 2001 +From bbf2aa245b238a9084a999b9fba76e26489afb34 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/Spigot-Server-Patches/0189-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0188-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 93% rename from Spigot-Server-Patches/0189-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to Spigot-Server-Patches/0188-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index be648c86bc..0cab3ba37b 100644 --- a/Spigot-Server-Patches/0189-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0188-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,4 +1,4 @@ -From 352865a7f9fb6d6cfb8a8810215d273e98978119 Mon Sep 17 00:00:00 2001 +From d71a9a895ba320deab7f2418146a9406c31dd6db Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:52:04 -0600 Subject: [PATCH] Option to prevent armor stands from doing entity lookups @@ -19,7 +19,7 @@ index a655b33..e8762c4 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d8c8579..5cd0dfc 100644 +index fbdc450..869c11f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1329,6 +1329,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0190-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0189-Add-option-to-remove-invalid-statistics.patch similarity index 97% rename from Spigot-Server-Patches/0190-Add-option-to-remove-invalid-statistics.patch rename to Spigot-Server-Patches/0189-Add-option-to-remove-invalid-statistics.patch index d3095f776e..29e4136979 100644 --- a/Spigot-Server-Patches/0190-Add-option-to-remove-invalid-statistics.patch +++ b/Spigot-Server-Patches/0189-Add-option-to-remove-invalid-statistics.patch @@ -1,4 +1,4 @@ -From 927e736bfd3f9dfcd1bea907e73f0675ceb1fc2a Mon Sep 17 00:00:00 2001 +From 5cb95a1756e3de3803e3e98a890f010f01dff02e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 20 Dec 2016 23:09:21 -0600 Subject: [PATCH] Add option to remove invalid statistics diff --git a/Spigot-Server-Patches/0191-IllegalPacketEvent.patch b/Spigot-Server-Patches/0190-IllegalPacketEvent.patch similarity index 97% rename from Spigot-Server-Patches/0191-IllegalPacketEvent.patch rename to Spigot-Server-Patches/0190-IllegalPacketEvent.patch index fb2184a0ac..0053f707b3 100644 --- a/Spigot-Server-Patches/0191-IllegalPacketEvent.patch +++ b/Spigot-Server-Patches/0190-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From 6d4a5bef0a4c29b02fe6a00de9f9a796138c7789 Mon Sep 17 00:00:00 2001 +From 9cf3486c0fb9f551a33bd99ddc3de4af38ca3411 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 23 Jun 2016 23:33:57 -0400 Subject: [PATCH] IllegalPacketEvent @@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent Fired for invalid data from players that represents hacking attempts diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2a1b2cc..5f1fdb1 100644 +index 30726ae..c6d6301 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; diff --git a/Spigot-Server-Patches/0192-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch similarity index 95% rename from Spigot-Server-Patches/0192-Properly-fix-item-duplication-bug.patch rename to Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch index 5b5a4ac18a..dbb54d7be6 100644 --- a/Spigot-Server-Patches/0192-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From c21aa545333086606e28bdfdff1e9615ed8cbd05 Mon Sep 17 00:00:00 2001 +From 0a1e92cdf99210ef0604ae8988ab0a2fbf0755ab Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug diff --git a/Spigot-Server-Patches/0193-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0192-String-based-Action-Bar-API.patch similarity index 97% rename from Spigot-Server-Patches/0193-String-based-Action-Bar-API.patch rename to Spigot-Server-Patches/0192-String-based-Action-Bar-API.patch index ab68f443dc..a7216e97b2 100644 --- a/Spigot-Server-Patches/0193-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0192-String-based-Action-Bar-API.patch @@ -1,4 +1,4 @@ -From d1d10801206c0dee2dd41dfe2e9e322924937428 Mon Sep 17 00:00:00 2001 +From 0c2fed00aa5d22aa5254f8bd7f10bbd7ffc9ad5e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 15:02:42 -0500 Subject: [PATCH] String based Action Bar API diff --git a/Spigot-Server-Patches/0194-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0193-Activation-Range-Improvements.patch similarity index 98% rename from Spigot-Server-Patches/0194-Activation-Range-Improvements.patch rename to Spigot-Server-Patches/0193-Activation-Range-Improvements.patch index 5cad849d7f..7e2964c2b2 100644 --- a/Spigot-Server-Patches/0194-Activation-Range-Improvements.patch +++ b/Spigot-Server-Patches/0193-Activation-Range-Improvements.patch @@ -1,4 +1,4 @@ -From d9154fd08a80f2de04ba789772b6f6dbd22751ce Mon Sep 17 00:00:00 2001 +From dc333e787198e993de7e00d4f8ce6af611bf91ea Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 22:38:06 -0500 Subject: [PATCH] Activation Range Improvements @@ -18,7 +18,7 @@ index fdfe5b9..ce39074 100644 private float b; private float c; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 7ebdb30..441cb4a 100644 +index 4ec6bc9..07688b1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -73,7 +73,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0195-Firework-API-s.patch b/Spigot-Server-Patches/0194-Firework-API-s.patch similarity index 98% rename from Spigot-Server-Patches/0195-Firework-API-s.patch rename to Spigot-Server-Patches/0194-Firework-API-s.patch index 14a8b3d9db..a3fa805213 100644 --- a/Spigot-Server-Patches/0195-Firework-API-s.patch +++ b/Spigot-Server-Patches/0194-Firework-API-s.patch @@ -1,4 +1,4 @@ -From 8e66799f7085f88708a9ae32b226ed7de17cd941 Mon Sep 17 00:00:00 2001 +From 0f47833fdfad3a2fdf93468cb86b10db068db575 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 01:18:33 -0500 Subject: [PATCH] Firework API's diff --git a/Spigot-Server-Patches/0196-Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/0195-Change-Outdated-Build-Download-URL-to-Paper-CI.patch similarity index 94% rename from Spigot-Server-Patches/0196-Change-Outdated-Build-Download-URL-to-Paper-CI.patch rename to Spigot-Server-Patches/0195-Change-Outdated-Build-Download-URL-to-Paper-CI.patch index 9ac88cce40..8ab89379bc 100644 --- a/Spigot-Server-Patches/0196-Change-Outdated-Build-Download-URL-to-Paper-CI.patch +++ b/Spigot-Server-Patches/0195-Change-Outdated-Build-Download-URL-to-Paper-CI.patch @@ -1,4 +1,4 @@ -From e720145d8e5a1c3c0106b829a5c4c5da1c7a5152 Mon Sep 17 00:00:00 2001 +From fead6b49be37928cbae49c947f841db2fe07ed38 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 29 Dec 2016 00:56:51 -0500 Subject: [PATCH] Change Outdated Build Download URL to Paper CI diff --git a/Spigot-Server-Patches/0197-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0196-PlayerTeleportEndGatewayEvent.patch similarity index 95% rename from Spigot-Server-Patches/0197-PlayerTeleportEndGatewayEvent.patch rename to Spigot-Server-Patches/0196-PlayerTeleportEndGatewayEvent.patch index 27d8a75fe6..9524e1a4b8 100644 --- a/Spigot-Server-Patches/0197-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0196-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From bde1bf70ad00fe9ce0d13d31798f197d4200e58d Mon Sep 17 00:00:00 2001 +From 0c1528c54ffa3864bdbb41ae001d1c46b165c72f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 21:44:50 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent diff --git a/Spigot-Server-Patches/0198-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch b/Spigot-Server-Patches/0197-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch similarity index 93% rename from Spigot-Server-Patches/0198-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch rename to Spigot-Server-Patches/0197-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch index 939aea1994..983ddbe33b 100644 --- a/Spigot-Server-Patches/0198-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch +++ b/Spigot-Server-Patches/0197-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch @@ -1,4 +1,4 @@ -From ca7fe3a86ae4acf708edf02536b44e23cb7654b7 Mon Sep 17 00:00:00 2001 +From f809fd07b0cdb887cc360f88627d7e920f8fe87f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 2 Jan 2017 02:07:24 -0500 Subject: [PATCH] MC-111699: Ignore Improper Anvil Item Name Packets @@ -11,7 +11,7 @@ This breaks the ability to rename more than 1 item at a time. See: https://bugs.mojang.com/browse/MC-111699 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 040c07b..f220c6f 100644 +index 48fc18f..85a397f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2426,7 +2426,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0199-MC-112017-Allow-31-instead-of-30-for-item-names.patch b/Spigot-Server-Patches/0198-MC-112017-Allow-31-instead-of-30-for-item-names.patch similarity index 92% rename from Spigot-Server-Patches/0199-MC-112017-Allow-31-instead-of-30-for-item-names.patch rename to Spigot-Server-Patches/0198-MC-112017-Allow-31-instead-of-30-for-item-names.patch index 6ce3dbf523..123c414713 100644 --- a/Spigot-Server-Patches/0199-MC-112017-Allow-31-instead-of-30-for-item-names.patch +++ b/Spigot-Server-Patches/0198-MC-112017-Allow-31-instead-of-30-for-item-names.patch @@ -1,11 +1,11 @@ -From e694c12adf1221ed66fc474954c8844e08b2922c Mon Sep 17 00:00:00 2001 +From 929d116641ae926b9aeaedd6885f339ab1bde996 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 2 Jan 2017 02:43:22 -0500 Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f220c6f..e5caad8 100644 +index 85a397f..be9c4cc 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2425,7 +2425,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0200-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0199-ShulkerBox-Dupe-Prevention.patch similarity index 93% rename from Spigot-Server-Patches/0200-ShulkerBox-Dupe-Prevention.patch rename to Spigot-Server-Patches/0199-ShulkerBox-Dupe-Prevention.patch index 37750b7e6b..8b27a6c2f8 100644 --- a/Spigot-Server-Patches/0200-ShulkerBox-Dupe-Prevention.patch +++ b/Spigot-Server-Patches/0199-ShulkerBox-Dupe-Prevention.patch @@ -1,4 +1,4 @@ -From bb27de78823694d38d084b00c2d77d5691a033a7 Mon Sep 17 00:00:00 2001 +From 2a9d9d7750cc9d6f0642032741dd62ee88e87a0f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 2 Jan 2017 16:32:56 -0500 Subject: [PATCH] ShulkerBox Dupe Prevention diff --git a/Spigot-Server-Patches/0201-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0200-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 95% rename from Spigot-Server-Patches/0201-Provide-E-TE-Chunk-count-stat-methods.patch rename to Spigot-Server-Patches/0200-Provide-E-TE-Chunk-count-stat-methods.patch index f39f01d1be..2ced8f7d24 100644 --- a/Spigot-Server-Patches/0201-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0200-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From a5f641a75dc0b2c006fd1c401171ef3d291a8567 Mon Sep 17 00:00:00 2001 +From 5ece888aafbc73029bfa5ff4ce2a9233214aed16 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:24:46 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -41,5 +41,5 @@ index 5a44a9f..da478ef 100644 public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { -- -2.9.2.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0202-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch similarity index 90% rename from Spigot-Server-Patches/0202-Enforce-Sync-Player-Saves.patch rename to Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch index f227d6309d..77e65f683a 100644 --- a/Spigot-Server-Patches/0202-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From 763bf0aa2f45e7acdaef142a614790cfbaa082c8 Mon Sep 17 00:00:00 2001 +From 8662d21eec7cf0a245afa76c2bb97f5aa46b622a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:41:58 -0500 Subject: [PATCH] Enforce Sync Player Saves @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 2f527f6ce..6a1e4f0f6 100644 +index f675a70..a9d59bb 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1212,6 +1212,7 @@ public abstract class PlayerList { @@ -27,5 +27,5 @@ index 2f527f6ce..6a1e4f0f6 100644 // Paper end -- -2.11.0 +2.9.3 diff --git a/Spigot-Server-Patches/0203-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0202-Enforce-Sync-Chunk-Unloads.patch similarity index 94% rename from Spigot-Server-Patches/0203-Enforce-Sync-Chunk-Unloads.patch rename to Spigot-Server-Patches/0202-Enforce-Sync-Chunk-Unloads.patch index 230402ae39..187a76eadb 100644 --- a/Spigot-Server-Patches/0203-Enforce-Sync-Chunk-Unloads.patch +++ b/Spigot-Server-Patches/0202-Enforce-Sync-Chunk-Unloads.patch @@ -1,4 +1,4 @@ -From 28cd2c20257447d30c493e2b0761dab0285ab10f Mon Sep 17 00:00:00 2001 +From 5c19853f344cc99877fa67e0bb8264c36140fb2f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 16:06:44 -0500 Subject: [PATCH] Enforce Sync Chunk Unloads @@ -27,5 +27,5 @@ index da478ef..95dcb9f 100644 public boolean regenerateChunk(int x, int z) { -- -2.9.2.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0204-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0203-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 87% rename from Spigot-Server-Patches/0204-Don-t-allow-entities-to-ride-themselves-572.patch rename to Spigot-Server-Patches/0203-Don-t-allow-entities-to-ride-themselves-572.patch index 0d81a58b04..99b91b33fe 100644 --- a/Spigot-Server-Patches/0204-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0203-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,11 +1,11 @@ -From 4be83edeb2087e34ee74ec25d501b8c286c48b96 Mon Sep 17 00:00:00 2001 +From 2cab3eb376f8c1e33443825626dcfd9f19220f2a Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Sun, 8 Jan 2017 04:31:36 +0000 Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ea36c53..97d935f 100644 +index 4582b44..a1d2233 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1869,6 +1869,7 @@ public abstract class Entity implements ICommandListener { @@ -17,5 +17,5 @@ index ea36c53..97d935f 100644 throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)"); } else { -- -2.9.3 (Apple Git-75) +2.9.3 diff --git a/Spigot-Server-Patches/0205-Fix-block-break-desync.patch b/Spigot-Server-Patches/0204-Fix-block-break-desync.patch similarity index 88% rename from Spigot-Server-Patches/0205-Fix-block-break-desync.patch rename to Spigot-Server-Patches/0204-Fix-block-break-desync.patch index 79ac2cc5ca..b3de780073 100644 --- a/Spigot-Server-Patches/0205-Fix-block-break-desync.patch +++ b/Spigot-Server-Patches/0204-Fix-block-break-desync.patch @@ -1,11 +1,11 @@ -From c59f5e3136aef85ce9ee1926f495469682065d9d Mon Sep 17 00:00:00 2001 +From 66f928386db0545e7f032a6f3c2818ce4f16fb27 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 8 Jan 2017 18:50:35 +1100 Subject: [PATCH] Fix block break desync diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e5caad8..a63bf40 100644 +index be9c4cc..f153e58 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -821,6 +821,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -17,5 +17,5 @@ index e5caad8..a63bf40 100644 } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) { return; -- -2.9.2.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0206-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0205-Assign-the-World-in-WorldGenStronghold.patch similarity index 92% rename from Spigot-Server-Patches/0206-Assign-the-World-in-WorldGenStronghold.patch rename to Spigot-Server-Patches/0205-Assign-the-World-in-WorldGenStronghold.patch index 818f1bba14..741d18258e 100644 --- a/Spigot-Server-Patches/0206-Assign-the-World-in-WorldGenStronghold.patch +++ b/Spigot-Server-Patches/0205-Assign-the-World-in-WorldGenStronghold.patch @@ -1,4 +1,4 @@ -From 2c920428190a7cd077e69044fb770862c62e3c86 Mon Sep 17 00:00:00 2001 +From bbe7c59189a5f0cc2aab47ab258b52d04df9bd1f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 14 Jan 2017 01:22:07 -0600 Subject: [PATCH] Assign the World in WorldGenStronghold diff --git a/work/Bukkit b/work/Bukkit index 39c5d6b4a1..4bef447a07 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 39c5d6b4a11b3e7c2eeb12a8bae5495f95ccc247 +Subproject commit 4bef447a073792a0858dc49e33593acb1c1948f5 diff --git a/work/CraftBukkit b/work/CraftBukkit index 775f1e1f7f..4d3bf20155 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 775f1e1f7f5783860ccb16feaf8c0cc53a6f9c18 +Subproject commit 4d3bf2015504897fc69af2a209d4c8bbe217394d diff --git a/work/Spigot b/work/Spigot index 7d78b81e39..b32c8f871b 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 7d78b81e398e61a69a774f05f427c24f0debd4fd +Subproject commit b32c8f871b2da575c1d9e9fa0532ba3e7e2eaa54