From 684bd2adbcbfbfdc14cfca5cdf5aa39cadbb4a7c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 2 Dec 2018 18:31:09 -0500 Subject: [PATCH] Upstate upstream B/CB --- work/Bukkit Submodule work/Bukkit 9a793cce8..0c1d258bb: > Make PigZapEvent extend EntityTransformEvent --- work/CraftBukkit Submodule work/CraftBukkit ee6684bba..6a398ac44: > SPIGOT-4511: Trident doesn't lose durability > Tweak outdated windows --- .../0036-Add-EntityZapEvent.patch | 27 +++--- ...ient-crashes-server-lists-and-Mojang.patch | 16 ++-- .../0197-Fix-this-stupid-bullshit.patch | 8 +- Spigot-Server-Patches/0353-Fix-1420.patch | 36 -------- ...-load-entity-AABB-to-prevent-wobble.patch} | 6 +- ....patch => 0354-Improve-death-events.patch} | 2 +- ...w-chests-to-be-placed-with-NBT-data.patch} | 6 +- ...I.patch => 0356-Mob-Pathfinding-API.patch} | 12 +-- ...nt-chunk-loading-from-Fluid-Flowing.patch} | 4 +- ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} | 2 +- ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} | 2 +- ...ning-from-loading-generating-chunks.patch} | 4 +- ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} | 4 +- ...Optimize-and-Fix-ExpiringMap-Issues.patch} | 10 +-- ...t-furnace-cook-speed-multiplier-API.patch} | 6 +- ...0364-Support-Overriding-World-Seeds.patch} | 2 +- ...h => 0365-Optimize-Server-World-Map.patch} | 6 +- ....patch => 0366-PreSpawnerSpawnEvent.patch} | 4 +- ...rseException-in-Entity-and-TE-names.patch} | 22 ++--- ... 0368-Avoid-dimension-id-collisions.patch} | 2 +- ...=> 0369-Honor-EntityAgeable.ageLock.patch} | 4 +- ...-Async-Chunk-Loading-and-Generation.patch} | 60 ++++++------- ...-Dimension-NBT-field-in-Entity-data.patch} | 4 +- ... 0372-Optimize-Light-Recalculations.patch} | 6 +- ...-entity-loss-due-to-unloaded-chunks.patch} | 4 +- ...-recheck-type-after-setting-a-block.patch} | 4 +- ...> 0375-Fix-Sending-Chunks-to-Client.patch} | 6 +- ...le-connection-throttle-kick-message.patch} | 6 +- ...Fix-FileIOThread-concurrency-issues.patch} | 4 +- ...8-Don-t-update-snapshot-blockstates.patch} | 4 +- ...> 0379-Hook-into-CB-plugin-rewrites.patch} | 4 +- ...80-Allow-setting-the-vex-s-summoner.patch} | 6 +- ...81-Add-LivingEntity-getTargetEntity.patch} | 2 +- ...I.patch => 0382-Add-sun-related-API.patch} | 10 +-- ...wned-for-Villager-Aggression-Config.patch} | 4 +- ...-Johnny.patch => 0384-Here-s-Johnny.patch} | 6 +- ...Turtle-API.patch => 0385-Turtle-API.patch} | 6 +- ...ire-EntityCombustEvent-for-phantoms.patch} | 4 +- ...it-lightning-strike-effect-distance.patch} | 8 +- ...-and-setters-for-EntityItem-owner-a.patch} | 6 +- ...her-worlds-for-shooter-of-projectil.patch} | 4 +- ...Call-player-spectator-target-events.patch} | 4 +- ...-Add-Velocity-IP-Forwarding-Support.patch} | 16 ++-- ...PI.patch => 0392-Add-more-Witch-API.patch} | 6 +- ...MC-93764.patch => 0393-Fix-MC-93764.patch} | 4 +- ...item-tag-if-interaction-is-canceled.patch} | 4 +- ...vent-players-from-moving-into-unloa.patch} | 6 +- ...6-Reset-players-airTicks-on-respawn.patch} | 6 +- ...-area-unicode-characters-from-signs.patch} | 4 +- ...after-profile-lookups-if-not-needed.patch} | 2 +- ...le-thread-count-default-for-bootstr.patch} | 4 +- ...Use-EntityTypes-for-living-entities.patch} | 84 +++++++++---------- ...id-item-for-enchantment-checks-on-b.patch} | 2 +- ...=> 0402-Optimize-World-Time-Updates.patch} | 4 +- ...tore-custom-InventoryHolder-support.patch} | 2 +- ...=> 0404-Use-Vanilla-Minecart-Speeds.patch} | 2 +- ...0405-Fix-SpongeAbsortEvent-handling.patch} | 2 +- ...-allow-digging-into-unloaded-chunks.patch} | 4 +- ...=> 0407-Optimize-redstone-algorithm.patch} | 10 +-- ...ntity-dismount-during-teleportation.patch} | 2 +- ...mits.patch => 0409-Book-Size-Limits.patch} | 6 +- ...ult-permission-message-configurable.patch} | 6 +- ...I.patch => 0411-Add-more-Zombie-API.patch} | 2 +- ...t-which-we-ll-consider-an-attackabl.patch} | 2 +- ...revent-rayTrace-from-loading-chunks.patch} | 4 +- ...-Large-Packets-disconnecting-client.patch} | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 68 files changed, 250 insertions(+), 287 deletions(-) delete mode 100644 Spigot-Server-Patches/0353-Fix-1420.patch rename Spigot-Server-Patches/{0354-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch => 0353-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch} (97%) rename Spigot-Server-Patches/{0355-Improve-death-events.patch => 0354-Improve-death-events.patch} (99%) rename Spigot-Server-Patches/{0356-Allow-chests-to-be-placed-with-NBT-data.patch => 0355-Allow-chests-to-be-placed-with-NBT-data.patch} (92%) rename Spigot-Server-Patches/{0357-Mob-Pathfinding-API.patch => 0356-Mob-Pathfinding-API.patch} (97%) rename Spigot-Server-Patches/{0358-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0357-Prevent-chunk-loading-from-Fluid-Flowing.patch} (97%) rename Spigot-Server-Patches/{0359-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0358-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%) rename Spigot-Server-Patches/{0360-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0359-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (98%) rename Spigot-Server-Patches/{0361-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0360-Prevent-mob-spawning-from-loading-generating-chunks.patch} (95%) rename Spigot-Server-Patches/{0362-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0361-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (97%) rename Spigot-Server-Patches/{0363-Optimize-and-Fix-ExpiringMap-Issues.patch => 0362-Optimize-and-Fix-ExpiringMap-Issues.patch} (98%) rename Spigot-Server-Patches/{0364-Implement-furnace-cook-speed-multiplier-API.patch => 0363-Implement-furnace-cook-speed-multiplier-API.patch} (96%) rename Spigot-Server-Patches/{0365-Support-Overriding-World-Seeds.patch => 0364-Support-Overriding-World-Seeds.patch} (98%) rename Spigot-Server-Patches/{0366-Optimize-Server-World-Map.patch => 0365-Optimize-Server-World-Map.patch} (98%) rename Spigot-Server-Patches/{0367-PreSpawnerSpawnEvent.patch => 0366-PreSpawnerSpawnEvent.patch} (94%) rename Spigot-Server-Patches/{0368-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0367-Catch-JsonParseException-in-Entity-and-TE-names.patch} (94%) rename Spigot-Server-Patches/{0369-Avoid-dimension-id-collisions.patch => 0368-Avoid-dimension-id-collisions.patch} (94%) rename Spigot-Server-Patches/{0370-Honor-EntityAgeable.ageLock.patch => 0369-Honor-EntityAgeable.ageLock.patch} (85%) rename Spigot-Server-Patches/{0371-Async-Chunk-Loading-and-Generation.patch => 0370-Async-Chunk-Loading-and-Generation.patch} (99%) rename Spigot-Server-Patches/{0372-Ignore-Dimension-NBT-field-in-Entity-data.patch => 0371-Ignore-Dimension-NBT-field-in-Entity-data.patch} (92%) rename Spigot-Server-Patches/{0373-Optimize-Light-Recalculations.patch => 0372-Optimize-Light-Recalculations.patch} (95%) rename Spigot-Server-Patches/{0374-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (94%) rename Spigot-Server-Patches/{0375-Don-t-recheck-type-after-setting-a-block.patch => 0374-Don-t-recheck-type-after-setting-a-block.patch} (92%) rename Spigot-Server-Patches/{0376-Fix-Sending-Chunks-to-Client.patch => 0375-Fix-Sending-Chunks-to-Client.patch} (94%) rename Spigot-Server-Patches/{0377-Configurable-connection-throttle-kick-message.patch => 0376-Configurable-connection-throttle-kick-message.patch} (93%) rename Spigot-Server-Patches/{0378-Fix-FileIOThread-concurrency-issues.patch => 0377-Fix-FileIOThread-concurrency-issues.patch} (93%) rename Spigot-Server-Patches/{0379-Don-t-update-snapshot-blockstates.patch => 0378-Don-t-update-snapshot-blockstates.patch} (90%) rename Spigot-Server-Patches/{0380-Hook-into-CB-plugin-rewrites.patch => 0379-Hook-into-CB-plugin-rewrites.patch} (98%) rename Spigot-Server-Patches/{0381-Allow-setting-the-vex-s-summoner.patch => 0380-Allow-setting-the-vex-s-summoner.patch} (90%) rename Spigot-Server-Patches/{0382-Add-LivingEntity-getTargetEntity.patch => 0381-Add-LivingEntity-getTargetEntity.patch} (99%) rename Spigot-Server-Patches/{0383-Add-sun-related-API.patch => 0382-Add-sun-related-API.patch} (91%) rename Spigot-Server-Patches/{0384-Check-Drowned-for-Villager-Aggression-Config.patch => 0383-Check-Drowned-for-Villager-Aggression-Config.patch} (94%) rename Spigot-Server-Patches/{0385-Here-s-Johnny.patch => 0384-Here-s-Johnny.patch} (91%) rename Spigot-Server-Patches/{0386-Turtle-API.patch => 0385-Turtle-API.patch} (97%) rename Spigot-Server-Patches/{0387-Fire-EntityCombustEvent-for-phantoms.patch => 0386-Fire-EntityCombustEvent-for-phantoms.patch} (89%) rename Spigot-Server-Patches/{0388-Limit-lightning-strike-effect-distance.patch => 0387-Limit-lightning-strike-effect-distance.patch} (96%) rename Spigot-Server-Patches/{0389-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0388-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (94%) rename Spigot-Server-Patches/{0390-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0389-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (94%) rename Spigot-Server-Patches/{0391-Call-player-spectator-target-events.patch => 0390-Call-player-spectator-target-events.patch} (96%) rename Spigot-Server-Patches/{0392-Add-Velocity-IP-Forwarding-Support.patch => 0391-Add-Velocity-IP-Forwarding-Support.patch} (97%) rename Spigot-Server-Patches/{0393-Add-more-Witch-API.patch => 0392-Add-more-Witch-API.patch} (97%) rename Spigot-Server-Patches/{0394-Fix-MC-93764.patch => 0393-Fix-MC-93764.patch} (86%) rename Spigot-Server-Patches/{0395-Don-t-modify-item-tag-if-interaction-is-canceled.patch => 0394-Don-t-modify-item-tag-if-interaction-is-canceled.patch} (96%) rename Spigot-Server-Patches/{0396-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0395-Add-option-to-prevent-players-from-moving-into-unloa.patch} (97%) rename Spigot-Server-Patches/{0397-Reset-players-airTicks-on-respawn.patch => 0396-Reset-players-airTicks-on-respawn.patch} (89%) rename Spigot-Server-Patches/{0398-Strip-private-area-unicode-characters-from-signs.patch => 0397-Strip-private-area-unicode-characters-from-signs.patch} (97%) rename Spigot-Server-Patches/{0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0398-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (96%) rename Spigot-Server-Patches/{0400-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0399-Use-more-reasonable-thread-count-default-for-bootstr.patch} (91%) rename Spigot-Server-Patches/{0401-Use-EntityTypes-for-living-entities.patch => 0400-Use-EntityTypes-for-living-entities.patch} (97%) rename Spigot-Server-Patches/{0402-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch => 0401-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch} (96%) rename Spigot-Server-Patches/{0403-Optimize-World-Time-Updates.patch => 0402-Optimize-World-Time-Updates.patch} (96%) rename Spigot-Server-Patches/{0404-Restore-custom-InventoryHolder-support.patch => 0403-Restore-custom-InventoryHolder-support.patch} (96%) rename Spigot-Server-Patches/{0405-Use-Vanilla-Minecart-Speeds.patch => 0404-Use-Vanilla-Minecart-Speeds.patch} (94%) rename Spigot-Server-Patches/{0406-Fix-SpongeAbsortEvent-handling.patch => 0405-Fix-SpongeAbsortEvent-handling.patch} (96%) rename Spigot-Server-Patches/{0407-Don-t-allow-digging-into-unloaded-chunks.patch => 0406-Don-t-allow-digging-into-unloaded-chunks.patch} (92%) rename Spigot-Server-Patches/{0408-Optimize-redstone-algorithm.patch => 0407-Optimize-redstone-algorithm.patch} (99%) rename Spigot-Server-Patches/{0409-force-entity-dismount-during-teleportation.patch => 0408-force-entity-dismount-during-teleportation.patch} (98%) rename Spigot-Server-Patches/{0410-Book-Size-Limits.patch => 0409-Book-Size-Limits.patch} (96%) rename Spigot-Server-Patches/{0411-Make-the-default-permission-message-configurable.patch => 0410-Make-the-default-permission-message-configurable.patch} (94%) rename Spigot-Server-Patches/{0412-Add-more-Zombie-API.patch => 0411-Add-more-Zombie-API.patch} (99%) rename Spigot-Server-Patches/{0413-limit-the-range-at-which-we-ll-consider-an-attackabl.patch => 0412-limit-the-range-at-which-we-ll-consider-an-attackabl.patch} (96%) rename Spigot-Server-Patches/{0414-Prevent-rayTrace-from-loading-chunks.patch => 0413-Prevent-rayTrace-from-loading-chunks.patch} (95%) rename Spigot-Server-Patches/{0415-Handle-Large-Packets-disconnecting-client.patch => 0414-Handle-Large-Packets-disconnecting-client.patch} (98%) diff --git a/Spigot-API-Patches/0036-Add-EntityZapEvent.patch b/Spigot-API-Patches/0036-Add-EntityZapEvent.patch index 7e3cf3e72b..ac371357b1 100644 --- a/Spigot-API-Patches/0036-Add-EntityZapEvent.patch +++ b/Spigot-API-Patches/0036-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 8cfb250c7604959047200370c281919b0ae0c420 Mon Sep 17 00:00:00 2001 +From d10ee21db91d466d499e140a462b37f04f22c787 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:34 -0700 Subject: [PATCH] Add EntityZapEvent @@ -6,10 +6,10 @@ Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java new file mode 100644 -index 00000000..0da89441 +index 00000000..3547d063 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java -@@ -0,0 +1,63 @@ +@@ -0,0 +1,62 @@ +package com.destroystokyo.paper.event.entity; + +import org.apache.commons.lang.Validate; @@ -18,24 +18,23 @@ index 00000000..0da89441 +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; +import org.bukkit.event.entity.EntityEvent; ++import org.bukkit.event.entity.EntityTransformEvent; + +import javax.annotation.Nonnull; + +/** + * Fired when lightning strikes an entity + */ -+public class EntityZapEvent extends EntityEvent implements Cancellable { ++public class EntityZapEvent extends EntityTransformEvent implements Cancellable { + private static final HandlerList handlers = new HandlerList(); + private boolean cancelled; + private final LightningStrike bolt; -+ private final Entity replacementEntity; + + public EntityZapEvent(final Entity entity, @Nonnull final LightningStrike bolt, @Nonnull final Entity replacementEntity) { -+ super(entity); ++ super(entity, replacementEntity, TransformReason.LIGHTNING); + Validate.notNull(bolt); + Validate.notNull(replacementEntity); + this.bolt = bolt; -+ this.replacementEntity = replacementEntity; + } + + public boolean isCancelled() { @@ -61,7 +60,7 @@ index 00000000..0da89441 + */ + @Nonnull + public Entity getReplacementEntity() { -+ return replacementEntity; ++ return getTransformedEntity(); + } + + @Override @@ -74,7 +73,7 @@ index 00000000..0da89441 + } +} diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java -index aa80ebf1..73844b8f 100644 +index 86983676..8dd1e3ce 100644 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java @@ -1,5 +1,6 @@ @@ -88,7 +87,7 @@ index aa80ebf1..73844b8f 100644 /** * Stores data for pigs being zapped */ --public class PigZapEvent extends EntityEvent implements Cancellable { +-public class PigZapEvent extends EntityTransformEvent implements Cancellable { - private static final HandlerList handlers = new HandlerList(); +public class PigZapEvent extends EntityZapEvent implements Cancellable { + //private static final HandlerList handlers = new HandlerList(); @@ -97,12 +96,12 @@ index aa80ebf1..73844b8f 100644 private final LightningStrike bolt; public PigZapEvent(final Pig pig, final LightningStrike bolt, final PigZombie pigzombie) { -- super(pig); +- super(pig, pigzombie, TransformReason.LIGHTNING); + super(pig, bolt, pigzombie); this.bolt = bolt; this.pigzombie = pigzombie; } -@@ -53,6 +54,8 @@ public class PigZapEvent extends EntityEvent implements Cancellable { +@@ -55,6 +56,8 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable { return pigzombie; } @@ -111,7 +110,7 @@ index aa80ebf1..73844b8f 100644 @Override public HandlerList getHandlers() { return handlers; -@@ -61,4 +64,6 @@ public class PigZapEvent extends EntityEvent implements Cancellable { +@@ -63,4 +66,6 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable { public static HandlerList getHandlerList() { return handlers; } @@ -119,5 +118,5 @@ index aa80ebf1..73844b8f 100644 + // Paper end } -- -2.18.0 +2.19.1 diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 398350c6fb..954b5723d5 100644 --- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From dee7b0281b97ab14ed3dbd83a24dfbe776ff782e Mon Sep 17 00:00:00 2001 +From a108d9cee628d6f30506090b13eea565d11d66b6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index b64cac2523..526f3af516 100644 +index b64cac252..526f3af51 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -49,7 +49,7 @@ public class EULA { @@ -19,7 +19,7 @@ index b64cac2523..526f3af516 100644 a.warn("Failed to save {}", this.b, exception); } finally { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2d812b0242..8a6589d95d 100644 +index 2d812b024..8a6589d95 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1213,7 +1213,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -32,7 +32,7 @@ index 2d812b0242..8a6589d95d 100644 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 174605b6e1..29b016e174 100644 +index 174605b6e..29b016e17 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -162,7 +162,7 @@ import org.bukkit.event.server.TabCompleteEvent; @@ -45,15 +45,15 @@ index 174605b6e1..29b016e174 100644 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 28a34b54e0..1ce1a2435d 100644 +index e9ea75579..56aa64bdf 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -200,12 +200,25 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -21); if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***"); -+ System.err.println("*** Please download a new build as per instructions from https://paperci.emc.gs/ ***"); // Paper ++ System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads ***"); // Paper System.err.println("*** Server will start in 20 seconds ***"); Thread.sleep(TimeUnit.SECONDS.toMillis(20)); } @@ -76,7 +76,7 @@ index 28a34b54e0..1ce1a2435d 100644 MinecraftServer.main(options); } catch (Throwable t) { diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 14a1084aa2..21316d67f1 100644 +index 14a1084aa..21316d67f 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -19,7 +19,7 @@ public class WatchdogThread extends Thread diff --git a/Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch index 415e412cb7..293fef1a4a 100644 --- a/Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 4f58e975be7c2202435ea860d5e962941c021d0a Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -9,17 +9,17 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa and to provide some level of hint without being disruptive. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index b174a4efa..c9a6b5afb 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -217,10 +217,12 @@ public class Main { Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -21); if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); + // Paper start - This is some stupid bullshit + System.err.println("*** Warning, you've not updated in a while! ***"); - System.err.println("*** Please download a new build as per instructions from https://paperci.emc.gs/ ***"); // Paper + System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads ***"); // Paper - System.err.println("*** Server will start in 20 seconds ***"); - Thread.sleep(TimeUnit.SECONDS.toMillis(20)); + //System.err.println("*** Server will start in 20 seconds ***"); diff --git a/Spigot-Server-Patches/0353-Fix-1420.patch b/Spigot-Server-Patches/0353-Fix-1420.patch deleted file mode 100644 index f2bd377aee..0000000000 --- a/Spigot-Server-Patches/0353-Fix-1420.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5f33e6c078a1af6a8a61615eda853205adf22009 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Fri, 7 Sep 2018 18:28:24 -0500 -Subject: [PATCH] Fix #1420 - - -diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 66e574bd3..a72d3dcc6 100644 ---- a/src/main/java/net/minecraft/server/EntityArrow.java -+++ b/src/main/java/net/minecraft/server/EntityArrow.java -@@ -492,7 +492,9 @@ public abstract class EntityArrow extends Entity implements IProjectile { - if (!this.world.isClientSide && (this.inGround || this.q()) && this.shake <= 0) { - // CraftBukkit start - ItemStack itemstack = this.getItemStack(); -- EntityItem item = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack); -+ EntityItem item = null; // Paper - GH-1420 - allow using event item -+ if (!itemstack.isEmpty()) { // Paper - GH-1420 (skip pick up event for fully damaged (or air) itemstack) -+ item = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack); // Paper - GH-1420 - allow using event item - if (this.fromPlayer == PickupStatus.ALLOWED && entityhuman.inventory.canHold(itemstack) > 0) { - PlayerPickupArrowEvent event = new PlayerPickupArrowEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), new org.bukkit.craftbukkit.entity.CraftItem(this.world.getServer(), this, item), (org.bukkit.entity.Arrow) this.getBukkitEntity()); - // event.setCancelled(!entityhuman.canPickUpLoot); TODO -@@ -502,9 +504,10 @@ public abstract class EntityArrow extends Entity implements IProjectile { - return; - } - } -+ } // Paper - GH-1420 - boolean flag = this.fromPlayer == EntityArrow.PickupStatus.ALLOWED || this.fromPlayer == EntityArrow.PickupStatus.CREATIVE_ONLY && entityhuman.abilities.canInstantlyBuild || this.q() && this.getShooter().getUniqueID() == entityhuman.getUniqueID(); - -- if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(item.getItemStack())) { -+ if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(item != null ? item.getItemStack() : itemstack)) { // Paper - GH-1420 - // CraftBukkit end - flag = false; - } --- -2.19.2 - diff --git a/Spigot-Server-Patches/0354-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch b/Spigot-Server-Patches/0353-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch similarity index 97% rename from Spigot-Server-Patches/0354-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch rename to Spigot-Server-Patches/0353-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch index 1efdcaec50..42be1e9624 100644 --- a/Spigot-Server-Patches/0354-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch +++ b/Spigot-Server-Patches/0353-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 5bd823869446fd35dde228b7603cf6d1a0e2ba5e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 4 Sep 2018 19:07:57 -0400 Subject: [PATCH] MC-2025: Save and load entity AABB to prevent wobble @@ -23,7 +23,7 @@ This reasoning leads us to one clear conclusion: The simplest, least invasive, a store the AABB in NBT data on chunk save and restore the AABB exactly as it was saved upon reload. diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index bf538684a..19819b134 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -3,12 +3,12 @@ package net.minecraft.server; @@ -46,7 +46,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 public AxisAlignedBB(double d0, double d1, double d2, double d3, double d4, double d5) { this.minX = Math.min(d0, d3); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index c97b7313c..665c85ca4 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1659,6 +1659,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0355-Improve-death-events.patch b/Spigot-Server-Patches/0354-Improve-death-events.patch similarity index 99% rename from Spigot-Server-Patches/0355-Improve-death-events.patch rename to Spigot-Server-Patches/0354-Improve-death-events.patch index 53bf1dd8f5..77db427f39 100644 --- a/Spigot-Server-Patches/0355-Improve-death-events.patch +++ b/Spigot-Server-Patches/0354-Improve-death-events.patch @@ -1,4 +1,4 @@ -From d8ea5a96611dca8752408160df05409db6832b22 Mon Sep 17 00:00:00 2001 +From 24e9f7d5343918cfe10bf2f9546045d768c32695 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events diff --git a/Spigot-Server-Patches/0356-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0355-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 92% rename from Spigot-Server-Patches/0356-Allow-chests-to-be-placed-with-NBT-data.patch rename to Spigot-Server-Patches/0355-Allow-chests-to-be-placed-with-NBT-data.patch index b691e38b63..7095e1700d 100644 --- a/Spigot-Server-Patches/0356-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/Spigot-Server-Patches/0355-Allow-chests-to-be-placed-with-NBT-data.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 18ec774319308ba9befa7a944933bd457259d580 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Sep 2018 18:43:31 -0500 Subject: [PATCH] Allow chests to be placed with NBT data diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index eea6d9419..4d29cb8d8 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -228,6 +228,15 @@ public final class ItemStack { @@ -25,7 +25,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 for (BlockState blockstate : blocks) { blockstate.update(true, false); diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 9573a4ecd..7594c16e9 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -305,7 +305,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic diff --git a/Spigot-Server-Patches/0357-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0356-Mob-Pathfinding-API.patch similarity index 97% rename from Spigot-Server-Patches/0357-Mob-Pathfinding-API.patch rename to Spigot-Server-Patches/0356-Mob-Pathfinding-API.patch index bd9676bcee..71460c9de6 100644 --- a/Spigot-Server-Patches/0357-Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/0356-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 1d6fd44a923b538e42ddf1eea7d285b544eb3bf7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 13:30:00 -0400 Subject: [PATCH] Mob Pathfinding API @@ -7,7 +7,7 @@ Implements Pathfinding API for mobs diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java new file mode 100644 -index 7ac07ac07ac0..7ac07ac07ac0 +index 000000000..ed3d86ddd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java @@ -0,0 +1,113 @@ @@ -125,7 +125,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 + } +} diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index efdfa7195..113fd9a50 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -65,7 +65,7 @@ public abstract class NavigationAbstract { @@ -173,7 +173,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations this.c = null; diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 5ffcda6d5..dae08cbbf 100644 --- a/src/main/java/net/minecraft/server/PathEntity.java +++ b/src/main/java/net/minecraft/server/PathEntity.java @@ -3,12 +3,13 @@ package net.minecraft.server; @@ -212,7 +212,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 return new Vec3D((double)pathpoint.a, (double)pathpoint.b, (double)pathpoint.c); } diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 497f47223..7fd1eff0b 100644 --- a/src/main/java/net/minecraft/server/PathPoint.java +++ b/src/main/java/net/minecraft/server/PathPoint.java @@ -1,9 +1,9 @@ @@ -229,7 +229,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 public int d = -1; public float e; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 5bf1cd06f..53c2d154e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable; diff --git a/Spigot-Server-Patches/0358-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0357-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 97% rename from Spigot-Server-Patches/0358-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to Spigot-Server-Patches/0357-Prevent-chunk-loading-from-Fluid-Flowing.patch index e0629ea40b..9ccc664122 100644 --- a/Spigot-Server-Patches/0358-Prevent-chunk-loading-from-Fluid-Flowing.patch +++ b/Spigot-Server-Patches/0357-Prevent-chunk-loading-from-Fluid-Flowing.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 18a6abee2190904692bcb23a2adbaaed0b14e3bc Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:36:16 -0400 Subject: [PATCH] Prevent chunk loading from Fluid Flowing diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index b7006b2cb..05e407f76 100644 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java @@ -186,7 +186,8 @@ public abstract class FluidTypeFlowing extends FluidType { diff --git a/Spigot-Server-Patches/0359-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0358-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 99% rename from Spigot-Server-Patches/0359-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to Spigot-Server-Patches/0358-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index 1a33d7313b..b166565142 100644 --- a/Spigot-Server-Patches/0359-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/Spigot-Server-Patches/0358-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -1,4 +1,4 @@ -From 18054d7c3c094b5f2977a5affe5d96376dad120b Mon Sep 17 00:00:00 2001 +From 75fc670b2570b9f692502fea5a0018884b5e823f Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:55 +0300 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values diff --git a/Spigot-Server-Patches/0360-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0359-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 98% rename from Spigot-Server-Patches/0360-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to Spigot-Server-Patches/0359-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch index b64af5201c..95573d4151 100644 --- a/Spigot-Server-Patches/0360-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch +++ b/Spigot-Server-Patches/0359-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch @@ -1,4 +1,4 @@ -From 9007c1a310edb90546c5a3ff3c7bced3f4fd6f54 Mon Sep 17 00:00:00 2001 +From 4a83ac5a4ae5fd765288ba4bb3a77b949af484d5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:56:36 -0400 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks diff --git a/Spigot-Server-Patches/0361-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0360-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0361-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to Spigot-Server-Patches/0360-Prevent-mob-spawning-from-loading-generating-chunks.patch index f235a039f4..8850d71b8f 100644 --- a/Spigot-Server-Patches/0361-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/Spigot-Server-Patches/0360-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 31e70a8d643471613959f369fb615891e277cf91 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:12:57 -0400 Subject: [PATCH] Prevent mob spawning from loading/generating chunks @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks also prevents if out of world border bounds diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 9221b41bc..2faa3ec97 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -129,9 +129,9 @@ public final class SpawnerCreature { diff --git a/Spigot-Server-Patches/0362-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0361-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 97% rename from Spigot-Server-Patches/0362-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to Spigot-Server-Patches/0361-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch index 569024ef96..a2d7aba2c2 100644 --- a/Spigot-Server-Patches/0362-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch +++ b/Spigot-Server-Patches/0361-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 38dd97023fdd51bb5d4d6481a5941f6f2b9820f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:47:01 -0400 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning Uses an EnumMap as well as a Set paired List for O(1) contains calls. diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index d381206fe..e87ed33c8 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -118,7 +118,7 @@ public abstract class BiomeBase { diff --git a/Spigot-Server-Patches/0363-Optimize-and-Fix-ExpiringMap-Issues.patch b/Spigot-Server-Patches/0362-Optimize-and-Fix-ExpiringMap-Issues.patch similarity index 98% rename from Spigot-Server-Patches/0363-Optimize-and-Fix-ExpiringMap-Issues.patch rename to Spigot-Server-Patches/0362-Optimize-and-Fix-ExpiringMap-Issues.patch index 4ac9a732af..db2eda9ca6 100644 --- a/Spigot-Server-Patches/0363-Optimize-and-Fix-ExpiringMap-Issues.patch +++ b/Spigot-Server-Patches/0362-Optimize-and-Fix-ExpiringMap-Issues.patch @@ -1,4 +1,4 @@ -From 2d658275fe79491d391314770482c2adaeccd2d7 Mon Sep 17 00:00:00 2001 +From 4c107ffe59e673bfbcf13d0da689080d0f9c5a23 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 16 Sep 2018 00:00:16 -0400 Subject: [PATCH] Optimize and Fix ExpiringMap Issues @@ -14,7 +14,7 @@ manipulation, and instead to run clean once per tick per active expiring map. diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java -index c8c1444e88..6723343b8b 100644 +index c8c1444e8..6723343b8 100644 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java @@ -143,13 +143,13 @@ public abstract class ChunkGeneratorAbstract implem @@ -34,7 +34,7 @@ index c8c1444e88..6723343b8b 100644 } diff --git a/src/main/java/net/minecraft/server/ExpiringMap.java b/src/main/java/net/minecraft/server/ExpiringMap.java -index ee97c2b6f6..795e735420 100644 +index ee97c2b6f..795e73542 100644 --- a/src/main/java/net/minecraft/server/ExpiringMap.java +++ b/src/main/java/net/minecraft/server/ExpiringMap.java @@ -2,94 +2,200 @@ package net.minecraft.server; @@ -288,7 +288,7 @@ index ee97c2b6f6..795e735420 100644 - // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d83e85dbff..2105fa50bf 100644 +index d83e85dbf..2105fa50b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -155,6 +155,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -308,7 +308,7 @@ index d83e85dbff..2105fa50bf 100644 co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java -index 9c2adb2351..04e29f58c3 100644 +index 9c2adb235..04e29f58c 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java @@ -144,7 +144,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator Date: Thu, 13 Sep 2018 08:45:21 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 3a69455b4..0ba13b790 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -10,6 +10,7 @@ import java.util.Map.Entry; @@ -57,7 +57,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 this.cookTimeTotal = this.s(); this.burn(irecipe); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 469dc4ff2..0ffbe8cd6 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java @@ -71,4 +71,18 @@ public class CraftFurnace extends CraftContainer implements F diff --git a/Spigot-Server-Patches/0365-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0364-Support-Overriding-World-Seeds.patch similarity index 98% rename from Spigot-Server-Patches/0365-Support-Overriding-World-Seeds.patch rename to Spigot-Server-Patches/0364-Support-Overriding-World-Seeds.patch index 6ec363db24..3ee85c2a11 100644 --- a/Spigot-Server-Patches/0365-Support-Overriding-World-Seeds.patch +++ b/Spigot-Server-Patches/0364-Support-Overriding-World-Seeds.patch @@ -1,4 +1,4 @@ -From f28b6e3bf3e931a18289a8b9cc2489438e441002 Mon Sep 17 00:00:00 2001 +From 64d56663c66ec98c6757398ac107881d086953c1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:05:31 -0400 Subject: [PATCH] Support Overriding World Seeds diff --git a/Spigot-Server-Patches/0366-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0365-Optimize-Server-World-Map.patch similarity index 98% rename from Spigot-Server-Patches/0366-Optimize-Server-World-Map.patch rename to Spigot-Server-Patches/0365-Optimize-Server-World-Map.patch index 730daf2cf6..5bda031f48 100644 --- a/Spigot-Server-Patches/0366-Optimize-Server-World-Map.patch +++ b/Spigot-Server-Patches/0365-Optimize-Server-World-Map.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From c40ff8852b2b3975cb6c23b02934953274edff7d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:37:31 -0400 Subject: [PATCH] Optimize Server World Map @@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java new file mode 100644 -index 7ac07ac07ac0..7ac07ac07ac0 +index 000000000..af9e4455c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java @@ -0,0 +1,191 @@ @@ -217,7 +217,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 1f9e8a082..292547be3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -87,7 +87,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati diff --git a/Spigot-Server-Patches/0367-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0366-PreSpawnerSpawnEvent.patch similarity index 94% rename from Spigot-Server-Patches/0367-PreSpawnerSpawnEvent.patch rename to Spigot-Server-Patches/0366-PreSpawnerSpawnEvent.patch index 25d1e9a05a..c1d6fbb588 100644 --- a/Spigot-Server-Patches/0367-PreSpawnerSpawnEvent.patch +++ b/Spigot-Server-Patches/0366-PreSpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 35fc67b72798399ed5e3ae8da18a9335c3d9d06d Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 18 Sep 2018 23:53:23 +0100 Subject: [PATCH] PreSpawnerSpawnEvent @@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for spawners. diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 0484c7006..733d5199a 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -102,11 +102,11 @@ public abstract class MobSpawnerAbstract { diff --git a/Spigot-Server-Patches/0368-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0367-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 94% rename from Spigot-Server-Patches/0368-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to Spigot-Server-Patches/0367-Catch-JsonParseException-in-Entity-and-TE-names.patch index 9ff524e912..e69bfd5713 100644 --- a/Spigot-Server-Patches/0368-Catch-JsonParseException-in-Entity-and-TE-names.patch +++ b/Spigot-Server-Patches/0367-Catch-JsonParseException-in-Entity-and-TE-names.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 4b39bd549cd60df7ff3af7a69bc71a27ecc5061e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 22 Sep 2018 15:56:59 -0400 Subject: [PATCH] Catch JsonParseException in Entity and TE names @@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly No more crashing though. diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 729859d13..2a1dffbf4 100644 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java @@ -57,7 +57,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener { @@ -26,7 +26,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 8abd71dfc..13c0c7ee8 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1734,7 +1734,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -39,7 +39,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible")); diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 0ef5ad116..f70f5899f 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -339,4 +339,19 @@ public final class MCUtil { @@ -63,7 +63,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 + } } diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index b4fae0d30..364a9fa7a 100644 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java @@ -74,7 +74,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity { @@ -76,7 +76,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 if (this.hasWorld()) { diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 480faa66e..f3ddb86d0 100644 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java @@ -236,7 +236,7 @@ public class TileEntityBrewingStand extends TileEntityContainer implements IWorl @@ -89,7 +89,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 this.fuelLevel = nbttagcompound.getByte("Fuel"); diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 7594c16e9..803793072 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -83,7 +83,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic @@ -102,7 +102,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 } diff --git a/src/main/java/net/minecraft/server/TileEntityDispenser.java b/src/main/java/net/minecraft/server/TileEntityDispenser.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index ddd2e0eb0..21bd156e9 100644 --- a/src/main/java/net/minecraft/server/TileEntityDispenser.java +++ b/src/main/java/net/minecraft/server/TileEntityDispenser.java @@ -107,7 +107,7 @@ public class TileEntityDispenser extends TileEntityLootable { @@ -115,7 +115,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 } diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 0ba13b790..978b9c046 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -218,7 +218,7 @@ public class TileEntityFurnace extends TileEntityContainer implements IWorldInve @@ -128,7 +128,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 // Paper start - cook speed API diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 10e18bf34..46069bf80 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -61,7 +61,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -141,7 +141,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 this.f = nbttagcompound.getInt("TransferCooldown"); diff --git a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index aa750ab91..36394aa78 100644 --- a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java +++ b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java @@ -254,7 +254,7 @@ public class TileEntityShulkerBox extends TileEntityLootable implements IWorldIn diff --git a/Spigot-Server-Patches/0369-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0368-Avoid-dimension-id-collisions.patch similarity index 94% rename from Spigot-Server-Patches/0369-Avoid-dimension-id-collisions.patch rename to Spigot-Server-Patches/0368-Avoid-dimension-id-collisions.patch index c45807737d..e66348c8d6 100644 --- a/Spigot-Server-Patches/0369-Avoid-dimension-id-collisions.patch +++ b/Spigot-Server-Patches/0368-Avoid-dimension-id-collisions.patch @@ -1,4 +1,4 @@ -From eb0e5f5cfd2a13ad8b14c6571b16dabfd5649848 Mon Sep 17 00:00:00 2001 +From 8538f8531c0bfe13b5b47466adf2975571cf8341 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 25 Sep 2018 06:53:43 +0200 Subject: [PATCH] Avoid dimension id collisions diff --git a/Spigot-Server-Patches/0370-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0369-Honor-EntityAgeable.ageLock.patch similarity index 85% rename from Spigot-Server-Patches/0370-Honor-EntityAgeable.ageLock.patch rename to Spigot-Server-Patches/0369-Honor-EntityAgeable.ageLock.patch index 5360f1c879..9f58978550 100644 --- a/Spigot-Server-Patches/0370-Honor-EntityAgeable.ageLock.patch +++ b/Spigot-Server-Patches/0369-Honor-EntityAgeable.ageLock.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 2da068e973592741d075509d62f65f9317ffe6e9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 23 Sep 2018 20:59:53 -0500 Subject: [PATCH] Honor EntityAgeable.ageLock diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 1d7c998aa..a11bdaadc 100644 --- a/src/main/java/net/minecraft/server/EntityAgeable.java +++ b/src/main/java/net/minecraft/server/EntityAgeable.java @@ -82,6 +82,7 @@ public abstract class EntityAgeable extends EntityCreature { diff --git a/Spigot-Server-Patches/0371-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0370-Async-Chunk-Loading-and-Generation.patch similarity index 99% rename from Spigot-Server-Patches/0371-Async-Chunk-Loading-and-Generation.patch rename to Spigot-Server-Patches/0370-Async-Chunk-Loading-and-Generation.patch index e047face24..e86a880dd8 100644 --- a/Spigot-Server-Patches/0371-Async-Chunk-Loading-and-Generation.patch +++ b/Spigot-Server-Patches/0370-Async-Chunk-Loading-and-Generation.patch @@ -1,4 +1,4 @@ -From 757279573b390c1ee00f7e33b2c7c3bc89ede9be Mon Sep 17 00:00:00 2001 +From 088f091d710c0163ea15f1dd11c9c53ca6ccb6a3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 16:55:04 -0400 Subject: [PATCH] Async Chunk Loading and Generation @@ -43,7 +43,7 @@ reading or writing to the chunk will be safe, so plugins still should not be touching chunks asynchronously! diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index b703e084..73b0c239 100644 +index b703e0848..73b0c2394 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -385,4 +385,57 @@ public class PaperConfig { @@ -106,7 +106,7 @@ index b703e084..73b0c239 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java new file mode 100644 -index 00000000..8f18c286 +index 000000000..8f18c2869 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java @@ -0,0 +1,347 @@ @@ -458,7 +458,7 @@ index 00000000..8f18c286 + +} diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 479a84a2..340b756b 100644 +index 479a84a25..340b756bb 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -184,6 +184,7 @@ public class Chunk implements IChunkAccess { @@ -470,7 +470,7 @@ index 479a84a2..340b756b 100644 Iterator iterator = protochunk.s().iterator(); diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java -index 39ac032b..1662e4eb 100644 +index 39ac032b0..1662e4eba 100644 --- a/src/main/java/net/minecraft/server/ChunkMap.java +++ b/src/main/java/net/minecraft/server/ChunkMap.java @@ -14,9 +14,17 @@ public class ChunkMap extends Long2ObjectOpenHashMap { @@ -576,7 +576,7 @@ index 39ac032b..1662e4eb 100644 public Chunk remove(Object object) { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index e64cb805..7a1f8488 100644 +index e64cb8051..7a1f84886 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -35,12 +35,12 @@ public class ChunkProviderServer implements IChunkProvider { @@ -726,7 +726,7 @@ index e64cb805..7a1f8488 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 9b4bc3ff..4c22f6d7 100644 +index 9b4bc3ff6..4c22f6d75 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -120,7 +120,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -753,7 +753,7 @@ index 9b4bc3ff..4c22f6d7 100644 completion = new Supplier() { public NBTTagCompound get() { diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index bdfc7d81..a5c4564d 100644 +index bdfc7d81f..a5c4564d6 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -24,7 +24,17 @@ public class ChunkSection { @@ -775,7 +775,7 @@ index bdfc7d81..a5c4564d 100644 public IBlockData getType(int i, int j, int k) { return this.blockIds.a(i, j, k); diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java -index 34019bd1..fc9091c8 100644 +index 34019bd1b..fc9091c80 100644 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java @@ -20,13 +20,14 @@ public class ChunkTaskScheduler extends Scheduler map) { diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 71a3636b..ff0fe254 100644 +index 71a3636be..ff0fe2541 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -3,7 +3,7 @@ package net.minecraft.server; @@ -931,7 +931,7 @@ index 71a3636b..ff0fe254 100644 // Paper start - Anti-Xray - Support default methods diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java -index 271dc41d..bd15534c 100644 +index 271dc41d4..bd15534c2 100644 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java @@ -19,7 +19,7 @@ import org.apache.logging.log4j.Logger; @@ -944,7 +944,7 @@ index 271dc41d..bd15534c 100644 private final MinecraftServer d; private final java.nio.file.Path e; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 13c0c7ee..552be8cd 100644 +index 13c0c7ee8..552be8cd8 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -209,7 +209,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -957,7 +957,7 @@ index 13c0c7ee..552be8cd 100644 this.aJ = Sets.newHashSet(); this.aL = new double[] { 0.0D, 0.0D, 0.0D}; diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java -index 4698ee99..dfb45cc4 100644 +index 4698ee99f..dfb45cc4e 100644 --- a/src/main/java/net/minecraft/server/IChunkLoader.java +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -6,6 +6,8 @@ import javax.annotation.Nullable; @@ -970,7 +970,7 @@ index 4698ee99..dfb45cc4 100644 Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer consumer) throws IOException; diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java -index 49fba097..9ad646f8 100644 +index 49fba0979..9ad646f8d 100644 --- a/src/main/java/net/minecraft/server/MathHelper.java +++ b/src/main/java/net/minecraft/server/MathHelper.java @@ -142,6 +142,7 @@ public class MathHelper { @@ -982,7 +982,7 @@ index 49fba097..9ad646f8 100644 fx = fx % 360.0F; if (fx >= 180.0F) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 292547be..5049595a 100644 +index 292547be3..5049595ab 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -503,6 +503,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -1072,7 +1072,7 @@ index 292547be..5049595a 100644 if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit diff --git a/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java new file mode 100644 -index 00000000..e9a38f9d +index 000000000..e9a38f9d9 --- /dev/null +++ b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java @@ -0,0 +1,655 @@ @@ -1732,7 +1732,7 @@ index 00000000..e9a38f9d + +} diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 2c7c8adf..62c524ef 100644 +index 2c7c8adf7..62c524ef3 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -29,16 +29,59 @@ public class PlayerChunk { @@ -1834,7 +1834,7 @@ index 2c7c8adf..62c524ef 100644 } } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 95baa1dc..9f602858 100644 +index 95baa1dc8..9f6028586 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -27,10 +27,10 @@ public class PlayerChunkMap { @@ -1894,7 +1894,7 @@ index 95baa1dc..9f602858 100644 private void e() { diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java -index 9c34319b..7149b147 100644 +index 9c34319b6..7149b1472 100644 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java +++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java @@ -35,7 +35,7 @@ public class RegionLimitedWorldAccess implements GeneratorAccess { @@ -1907,7 +1907,7 @@ index 9c34319b..7149b147 100644 this.m = world.getChunkProvider().getChunkGenerator().getSettings(); this.i = world.getSeaLevel(); diff --git a/src/main/java/net/minecraft/server/SchedulerBatch.java b/src/main/java/net/minecraft/server/SchedulerBatch.java -index d868149d..0d45d933 100644 +index d868149d1..0d45d933e 100644 --- a/src/main/java/net/minecraft/server/SchedulerBatch.java +++ b/src/main/java/net/minecraft/server/SchedulerBatch.java @@ -9,6 +9,7 @@ public class SchedulerBatch, R> { @@ -1962,7 +1962,7 @@ index d868149d..0d45d933 100644 } } diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java -index a5cf017d..def8730b 100644 +index a5cf017da..def8730b8 100644 --- a/src/main/java/net/minecraft/server/StructurePiece.java +++ b/src/main/java/net/minecraft/server/StructurePiece.java @@ -14,7 +14,7 @@ public abstract class StructurePiece { @@ -1989,7 +1989,7 @@ index a5cf017d..def8730b 100644 return null; } diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java -index 1926c902..1117e4ae 100644 +index 1926c902a..1117e4ae2 100644 --- a/src/main/java/net/minecraft/server/StructureStart.java +++ b/src/main/java/net/minecraft/server/StructureStart.java @@ -6,7 +6,7 @@ import java.util.List; @@ -2038,7 +2038,7 @@ index 1926c902..1117e4ae 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 016d50d3..f1495d30 100644 +index 016d50d3c..f1495d30c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -46,7 +46,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; @@ -2135,7 +2135,7 @@ index 016d50d3..f1495d30 100644 if (entity == null) return false; if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java -index fa99fe01..4f49786a 100644 +index fa99fe014..4f49786aa 100644 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java @@ -9,24 +9,29 @@ import java.util.Random; @@ -2282,7 +2282,7 @@ index fa99fe01..4f49786a 100644 } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6e54b71e..a54ea5a6 100644 +index 6e54b71e8..a54ea5a69 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -731,7 +731,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -2295,7 +2295,7 @@ index 6e54b71e..a54ea5a6 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c56511ab..648ac4d1 100644 +index c56511abc..648ac4d18 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1017,8 +1017,12 @@ public final class CraftServer implements Server { @@ -2323,7 +2323,7 @@ index c56511ab..648ac4d1 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7e6a7b0e..ef5a7bc3 100644 +index 7e6a7b0e9..ef5a7bc38 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -162,6 +162,16 @@ public class CraftWorld implements World { @@ -2361,7 +2361,7 @@ index 7e6a7b0e..ef5a7bc3 100644 if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) { unloadChunk(chunkCoordX + x, chunkCoordZ + z); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c70890cc..957ad628 100644 +index c70890cc5..957ad628e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -80,6 +80,7 @@ public class CraftEventFactory { @@ -2423,7 +2423,7 @@ index c70890cc..957ad628 100644 if (!event.isCancelled()) { diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java -index 04e29f58..5fae0c6a 100644 +index 04e29f58c..5fae0c6ad 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java @@ -21,6 +21,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator Date: Thu, 27 Sep 2018 00:08:31 -0400 Subject: [PATCH] Ignore Dimension NBT field in Entity data @@ -14,7 +14,7 @@ DimensionManager set to the world it is being placed into. This fixes corrupt entities breaking chunk saving in custom worlds. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 552be8cd8..dd96b09e6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1721,7 +1721,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0373-Optimize-Light-Recalculations.patch b/Spigot-Server-Patches/0372-Optimize-Light-Recalculations.patch similarity index 95% rename from Spigot-Server-Patches/0373-Optimize-Light-Recalculations.patch rename to Spigot-Server-Patches/0372-Optimize-Light-Recalculations.patch index 14ecd1fa56..9094d8ba2c 100644 --- a/Spigot-Server-Patches/0373-Optimize-Light-Recalculations.patch +++ b/Spigot-Server-Patches/0372-Optimize-Light-Recalculations.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 3b42f567b8c42ad2bd2020fc41c14861f81a6b89 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Sep 2018 20:46:29 -0400 Subject: [PATCH] Optimize Light Recalculations @@ -14,7 +14,7 @@ Also optimizes to not repeatedly look up the same chunk for light lookups. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 340b756bb..cc0413000 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -347,7 +347,7 @@ public class Chunk implements IChunkAccess { @@ -36,7 +36,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 int i1 = iblockdata.b(this.world, blockposition); int j1 = iblockdata1.b(this.world, blockposition); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index f1495d30c..7e7b62b1d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -589,8 +589,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0374-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch similarity index 94% rename from Spigot-Server-Patches/0374-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch rename to Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch index 66c10bdb5c..18aa70a083 100644 --- a/Spigot-Server-Patches/0374-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 02e6b94c373272fc2104380efa085fba07e0802d Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Sep 2018 21:49:53 -0400 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks @@ -18,7 +18,7 @@ This change ensures the chunks are always loaded when entities are added to the world, or a valid entity moves between chunks. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 7e7b62b1d..23529954b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1147,7 +1147,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0375-Don-t-recheck-type-after-setting-a-block.patch b/Spigot-Server-Patches/0374-Don-t-recheck-type-after-setting-a-block.patch similarity index 92% rename from Spigot-Server-Patches/0375-Don-t-recheck-type-after-setting-a-block.patch rename to Spigot-Server-Patches/0374-Don-t-recheck-type-after-setting-a-block.patch index 1b8dcc6eed..19c4e7cdf6 100644 --- a/Spigot-Server-Patches/0375-Don-t-recheck-type-after-setting-a-block.patch +++ b/Spigot-Server-Patches/0374-Don-t-recheck-type-after-setting-a-block.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 4ba833e6073cfbed977574a9ec3bbe902906f5e6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Sep 2018 22:27:33 -0400 Subject: [PATCH] Don't recheck type after setting a block @@ -16,7 +16,7 @@ be having data corruption issues anyways. This provides a small boost to all setType calls. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index cc0413000..8d9d5ae9e 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -553,7 +553,7 @@ public class Chunk implements IChunkAccess { diff --git a/Spigot-Server-Patches/0376-Fix-Sending-Chunks-to-Client.patch b/Spigot-Server-Patches/0375-Fix-Sending-Chunks-to-Client.patch similarity index 94% rename from Spigot-Server-Patches/0376-Fix-Sending-Chunks-to-Client.patch rename to Spigot-Server-Patches/0375-Fix-Sending-Chunks-to-Client.patch index 8ef0a3b2e7..d6e460f3ce 100644 --- a/Spigot-Server-Patches/0376-Fix-Sending-Chunks-to-Client.patch +++ b/Spigot-Server-Patches/0375-Fix-Sending-Chunks-to-Client.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From a709d7c592271a2d476345299d5acaa67e9b6a16 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 29 Sep 2018 01:18:16 -0400 Subject: [PATCH] Fix Sending Chunks to Client @@ -14,7 +14,7 @@ This fix always sends chunks to the client, and simply updates the client anytime post processing is triggered with the new chunk data. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 8d9d5ae9e..45c3aad70 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1185,7 +1185,7 @@ public class Chunk implements IChunkAccess { @@ -41,7 +41,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 62c524ef3..36600523f 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -23,7 +23,7 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0377-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0376-Configurable-connection-throttle-kick-message.patch similarity index 93% rename from Spigot-Server-Patches/0377-Configurable-connection-throttle-kick-message.patch rename to Spigot-Server-Patches/0376-Configurable-connection-throttle-kick-message.patch index b6c890dc24..91e880ec77 100644 --- a/Spigot-Server-Patches/0377-Configurable-connection-throttle-kick-message.patch +++ b/Spigot-Server-Patches/0376-Configurable-connection-throttle-kick-message.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 1fa1da69183f3f686be206c0ae935fcca0a23984 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 2 Oct 2018 09:57:50 +0100 Subject: [PATCH] Configurable connection throttle kick message diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 73b0c2394..e87c79387 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -305,6 +305,11 @@ public class PaperConfig { @@ -21,7 +21,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index daea8330c..88a275afd 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -37,7 +37,7 @@ public class HandshakeListener implements PacketHandshakingInListener { diff --git a/Spigot-Server-Patches/0378-Fix-FileIOThread-concurrency-issues.patch b/Spigot-Server-Patches/0377-Fix-FileIOThread-concurrency-issues.patch similarity index 93% rename from Spigot-Server-Patches/0378-Fix-FileIOThread-concurrency-issues.patch rename to Spigot-Server-Patches/0377-Fix-FileIOThread-concurrency-issues.patch index 24cbb063e0..415169a17a 100644 --- a/Spigot-Server-Patches/0378-Fix-FileIOThread-concurrency-issues.patch +++ b/Spigot-Server-Patches/0377-Fix-FileIOThread-concurrency-issues.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 53e69860d3f27a67cd70a1984effe3377ee67735 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 3 Oct 2018 19:04:53 +0100 Subject: [PATCH] Fix FileIOThread concurrency issues @@ -9,7 +9,7 @@ issues when this counter is updated from multiple threads, potentially causing these counters to desync due to the unsafe volatile update diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 97917551a..1959bc066 100644 --- a/src/main/java/net/minecraft/server/FileIOThread.java +++ b/src/main/java/net/minecraft/server/FileIOThread.java @@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger; diff --git a/Spigot-Server-Patches/0379-Don-t-update-snapshot-blockstates.patch b/Spigot-Server-Patches/0378-Don-t-update-snapshot-blockstates.patch similarity index 90% rename from Spigot-Server-Patches/0379-Don-t-update-snapshot-blockstates.patch rename to Spigot-Server-Patches/0378-Don-t-update-snapshot-blockstates.patch index 309b1ea615..18d109d2ac 100644 --- a/Spigot-Server-Patches/0379-Don-t-update-snapshot-blockstates.patch +++ b/Spigot-Server-Patches/0378-Don-t-update-snapshot-blockstates.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 96c0dacc79b25fda35fad6855acdb01770785d04 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 5 Oct 2018 15:46:46 +1000 Subject: [PATCH] Don't update snapshot blockstates diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index d4d9c5fc5..f5c6dbd85 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -131,7 +131,11 @@ public class CraftBlockEntityState extends CraftBlockState diff --git a/Spigot-Server-Patches/0380-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0379-Hook-into-CB-plugin-rewrites.patch similarity index 98% rename from Spigot-Server-Patches/0380-Hook-into-CB-plugin-rewrites.patch rename to Spigot-Server-Patches/0379-Hook-into-CB-plugin-rewrites.patch index 4c730b4da5..c135b8cabf 100644 --- a/Spigot-Server-Patches/0380-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0379-Hook-into-CB-plugin-rewrites.patch @@ -1,4 +1,4 @@ -From 1327dba7574aab69be1fae6afa1bd0a01503682e Mon Sep 17 00:00:00 2001 +From bf52fece0030ab6d6b59c6b88c994acdd8417219 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 3 Oct 2018 20:09:18 -0400 Subject: [PATCH] Hook into CB plugin rewrites @@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're debugging in an IDE pre-relocate. diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 24d608399f..212a50c88e 100644 +index 24d608399..212a50c88 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -6,7 +6,9 @@ import java.io.FileOutputStream; diff --git a/Spigot-Server-Patches/0381-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0380-Allow-setting-the-vex-s-summoner.patch similarity index 90% rename from Spigot-Server-Patches/0381-Allow-setting-the-vex-s-summoner.patch rename to Spigot-Server-Patches/0380-Allow-setting-the-vex-s-summoner.patch index cbd4eabdf6..d115363d34 100644 --- a/Spigot-Server-Patches/0381-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0380-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 98f5aff421ed8074a66f272dba2c70656b9d1b7c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:44 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 6e029ff44..1bf705e82 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -127,6 +127,7 @@ public class EntityVex extends EntityMonster { @@ -17,7 +17,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 this.b = entityinsentient; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 927ed9a9a..c23b1e960 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex { diff --git a/Spigot-Server-Patches/0382-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0381-Add-LivingEntity-getTargetEntity.patch similarity index 99% rename from Spigot-Server-Patches/0382-Add-LivingEntity-getTargetEntity.patch rename to Spigot-Server-Patches/0381-Add-LivingEntity-getTargetEntity.patch index 89dcd48d32..02a05f19e2 100644 --- a/Spigot-Server-Patches/0382-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0381-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From e43e19ddbebb2d46b4c2a09a850c958beba89093 Mon Sep 17 00:00:00 2001 +From 6a211dc82faa943d2d35fae1568ec2ada8edc859 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:33:08 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/Spigot-Server-Patches/0383-Add-sun-related-API.patch b/Spigot-Server-Patches/0382-Add-sun-related-API.patch similarity index 91% rename from Spigot-Server-Patches/0383-Add-sun-related-API.patch rename to Spigot-Server-Patches/0382-Add-sun-related-API.patch index 48371d7d96..882883fb3d 100644 --- a/Spigot-Server-Patches/0383-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0382-Add-sun-related-API.patch @@ -1,11 +1,11 @@ -From d95fe94f2eaa0f9bb2be771c4005d63dcd2b9406 Mon Sep 17 00:00:00 2001 +From dc1d2eba4ad7ca6e7912c0ad98dc8b7189e888b9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index db9201d292..6c9776f57e 100644 +index db9201d29..6c9776f57 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1297,6 +1297,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -17,7 +17,7 @@ index db9201d292..6c9776f57e 100644 if (this.world.L() && !this.world.isClientSide) { float f = this.az(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 23529954b4..7914f9b606 100644 +index 23529954b..7914f9b60 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -29,7 +29,7 @@ index 23529954b4..7914f9b606 100644 return this.G < 4; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ef5a7bc38a..10fa122536 100644 +index ef5a7bc38..10fa12253 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -523,6 +523,12 @@ public class CraftWorld implements World { @@ -46,7 +46,7 @@ index ef5a7bc38a..10fa122536 100644 return createExplosion(x, y, z, power, false, true); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 53c2d154ed..40a429942e 100644 +index 53c2d154e..40a429942 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -68,4 +68,10 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { diff --git a/Spigot-Server-Patches/0384-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0383-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 94% rename from Spigot-Server-Patches/0384-Check-Drowned-for-Villager-Aggression-Config.patch rename to Spigot-Server-Patches/0383-Check-Drowned-for-Villager-Aggression-Config.patch index 4d7726422f..7c43df88ad 100644 --- a/Spigot-Server-Patches/0384-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0383-Check-Drowned-for-Villager-Aggression-Config.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 339773e609c502e87439121628825c9b02857833 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 10 Oct 2018 21:22:44 -0500 Subject: [PATCH] Check Drowned for Villager Aggression Config diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index b4500eead..512c22df9 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -27,7 +27,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { diff --git a/Spigot-Server-Patches/0385-Here-s-Johnny.patch b/Spigot-Server-Patches/0384-Here-s-Johnny.patch similarity index 91% rename from Spigot-Server-Patches/0385-Here-s-Johnny.patch rename to Spigot-Server-Patches/0384-Here-s-Johnny.patch index 3d49fe3f5b..e53ae20068 100644 --- a/Spigot-Server-Patches/0385-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0384-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 4199535f4288d3876a9f2973e4dcc3f2ec3c4d1e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:22 -0500 Subject: [PATCH] Here's Johnny! diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 597878e2c..4e59df891 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -4,7 +4,7 @@ import java.util.function.Predicate; @@ -18,7 +18,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 return entity instanceof EntityLiving && ((EntityLiving)entity).df(); }; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 951d47929..5ff957ced 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator { diff --git a/Spigot-Server-Patches/0386-Turtle-API.patch b/Spigot-Server-Patches/0385-Turtle-API.patch similarity index 97% rename from Spigot-Server-Patches/0386-Turtle-API.patch rename to Spigot-Server-Patches/0385-Turtle-API.patch index 8c7af908ea..a7c19514be 100644 --- a/Spigot-Server-Patches/0386-Turtle-API.patch +++ b/Spigot-Server-Patches/0385-Turtle-API.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 678b14086c37ad2be235f4c77dc2e4b3050d495a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 29 Sep 2018 16:08:23 -0500 Subject: [PATCH] Turtle API diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 70cf407dc..2c1db9b78 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal { @@ -104,7 +104,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 public void c() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 123a2c75c..8edcf7af6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java @@ -1,6 +1,8 @@ diff --git a/Spigot-Server-Patches/0387-Fire-EntityCombustEvent-for-phantoms.patch b/Spigot-Server-Patches/0386-Fire-EntityCombustEvent-for-phantoms.patch similarity index 89% rename from Spigot-Server-Patches/0387-Fire-EntityCombustEvent-for-phantoms.patch rename to Spigot-Server-Patches/0386-Fire-EntityCombustEvent-for-phantoms.patch index 2c9b454a44..3bba7e9186 100644 --- a/Spigot-Server-Patches/0387-Fire-EntityCombustEvent-for-phantoms.patch +++ b/Spigot-Server-Patches/0386-Fire-EntityCombustEvent-for-phantoms.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 67768c485ef423216d91265e34352f93c6e185d8 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sat, 13 Oct 2018 22:29:17 +0200 Subject: [PATCH] Fire EntityCombustEvent for phantoms diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index e27600109..098662193 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -105,7 +105,12 @@ public class EntityPhantom extends EntityFlying implements IMonster { diff --git a/Spigot-Server-Patches/0388-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0387-Limit-lightning-strike-effect-distance.patch similarity index 96% rename from Spigot-Server-Patches/0388-Limit-lightning-strike-effect-distance.patch rename to Spigot-Server-Patches/0387-Limit-lightning-strike-effect-distance.patch index aee998bdc9..97e680c1d2 100644 --- a/Spigot-Server-Patches/0388-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0387-Limit-lightning-strike-effect-distance.patch @@ -1,11 +1,11 @@ -From aa465a00b42e0ce2a01128f6259dc8b5ae402186 Mon Sep 17 00:00:00 2001 +From 219eb45985e44415921f1d03c2bb7e940bde06b1 Mon Sep 17 00:00:00 2001 From: Trigary Date: Fri, 14 Sep 2018 17:42:08 +0200 Subject: [PATCH] Limit lightning strike effect distance diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 93bf8c6d..f94fa5df 100644 +index 93bf8c6d3..f94fa5df2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -237,6 +237,28 @@ public class PaperWorldConfig { @@ -38,7 +38,7 @@ index 93bf8c6d..f94fa5df 100644 public boolean firePhysicsEventForRedstone = false; private void firePhysicsEventForRedstone() { diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java -index afbe43dd..d732be52 100644 +index afbe43dd3..d732be52e 100644 --- a/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java @@ -60,6 +60,17 @@ public class EntityLightning extends EntityWeather { @@ -69,7 +69,7 @@ index afbe43dd..d732be52 100644 --this.lifeTicks; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a54ea5a6..818e4c37 100644 +index a54ea5a69..818e4c376 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1087,7 +1087,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/Spigot-Server-Patches/0389-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0388-Implement-getters-and-setters-for-EntityItem-owner-a.patch similarity index 94% rename from Spigot-Server-Patches/0389-Implement-getters-and-setters-for-EntityItem-owner-a.patch rename to Spigot-Server-Patches/0388-Implement-getters-and-setters-for-EntityItem-owner-a.patch index bcfaff5071..313cf8db17 100644 --- a/Spigot-Server-Patches/0389-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0388-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 5144ca531ef4e30f914d043754c2f6f298413c26 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:23 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 6037ce0e9..10eb882f4 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -410,20 +410,22 @@ public class EntityItem extends Entity { @@ -37,7 +37,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 this.f = uuid; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 1df17f09b..25666792e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack; diff --git a/Spigot-Server-Patches/0390-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0389-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 94% rename from Spigot-Server-Patches/0390-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to Spigot-Server-Patches/0389-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index 50c818ad27..4dfbc36d19 100644 --- a/Spigot-Server-Patches/0390-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0389-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 8f295e5a58d67196f276972878a4f12616dbe3c4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 17 Oct 2018 19:17:27 -0400 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles @@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check other worlds. diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index dd8af4be8..b4a5bc600 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -250,11 +250,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile { diff --git a/Spigot-Server-Patches/0391-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0390-Call-player-spectator-target-events.patch similarity index 96% rename from Spigot-Server-Patches/0391-Call-player-spectator-target-events.patch rename to Spigot-Server-Patches/0390-Call-player-spectator-target-events.patch index bad9546f47..8e87d5eeed 100644 --- a/Spigot-Server-Patches/0391-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0390-Call-player-spectator-target-events.patch @@ -1,11 +1,11 @@ -From b94b61cf628b8659d485330e8c7c9e27978e7cab Mon Sep 17 00:00:00 2001 +From 8d90f48b3015935a82ecebbe74f46795b43f5f62 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:32:19 -0500 Subject: [PATCH] Call player spectator target events diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 720eb9184f..7bbcaba053 100644 +index 720eb9184..7bbcaba05 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -62,7 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0392-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0391-Add-Velocity-IP-Forwarding-Support.patch similarity index 97% rename from Spigot-Server-Patches/0392-Add-Velocity-IP-Forwarding-Support.patch rename to Spigot-Server-Patches/0391-Add-Velocity-IP-Forwarding-Support.patch index 539a45e25e..07ab3c8d4a 100644 --- a/Spigot-Server-Patches/0392-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0391-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 63b09e7f09469d97b06df38f7dcfa4e7cab1eba2 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 8 Oct 2018 14:36:14 -0400 Subject: [PATCH] Add Velocity IP Forwarding Support @@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index e87c79387..bc74ea2f0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -8,6 +8,7 @@ import java.io.IOException; @@ -55,7 +55,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 } diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java new file mode 100644 -index 7ac07ac07ac0..7ac07ac07ac0 +index 000000000..fdd8708f9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java @@ -0,0 +1,67 @@ @@ -127,7 +127,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 + } +} diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 5778a5201..b6a3992a3 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -43,6 +43,7 @@ public class LoginListener implements PacketLoginInListener, ITickable { @@ -203,7 +203,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 } diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index b2afec5e4..97a9dffe6 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -48,7 +48,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -216,7 +216,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 public com.mojang.authlib.properties.Property[] spoofedProfile; public boolean preparing = true; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index b95836d44..621aad150 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf { @@ -244,7 +244,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 int j = this.g(); diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index e3c0094f7..edfd4a506 100644 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java @@ -3,8 +3,8 @@ package net.minecraft.server; @@ -259,7 +259,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 public PacketLoginInCustomPayload() { } diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 9c5559ece..9de0421bb 100644 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet Date: Fri, 12 Oct 2018 14:10:46 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index b5f676f04..41673ec9a 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -1,5 +1,11 @@ @@ -94,7 +94,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644 f = super.applyMagicModifier(damagesource, f); if (damagesource.getEntity() == this) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index f25998eb6..ac465bda2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java @@ -6,6 +6,13 @@ import org.bukkit.craftbukkit.CraftServer; diff --git a/Spigot-Server-Patches/0394-Fix-MC-93764.patch b/Spigot-Server-Patches/0393-Fix-MC-93764.patch similarity index 86% rename from Spigot-Server-Patches/0394-Fix-MC-93764.patch rename to Spigot-Server-Patches/0393-Fix-MC-93764.patch index 0251b28537..f35bc4c496 100644 --- a/Spigot-Server-Patches/0394-Fix-MC-93764.patch +++ b/Spigot-Server-Patches/0393-Fix-MC-93764.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 93f360e4b50c87654275e6f1e3d8e4d043fbbea0 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Oct 2018 19:38:45 -0500 Subject: [PATCH] Fix MC-93764 diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 54ca83286..0c854170c 100644 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java @@ -25,7 +25,7 @@ public class WorldProviderTheEnd extends WorldProvider { diff --git a/Spigot-Server-Patches/0395-Don-t-modify-item-tag-if-interaction-is-canceled.patch b/Spigot-Server-Patches/0394-Don-t-modify-item-tag-if-interaction-is-canceled.patch similarity index 96% rename from Spigot-Server-Patches/0395-Don-t-modify-item-tag-if-interaction-is-canceled.patch rename to Spigot-Server-Patches/0394-Don-t-modify-item-tag-if-interaction-is-canceled.patch index f5a1b3123e..fa38121d1d 100644 --- a/Spigot-Server-Patches/0395-Don-t-modify-item-tag-if-interaction-is-canceled.patch +++ b/Spigot-Server-Patches/0394-Don-t-modify-item-tag-if-interaction-is-canceled.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From d9e749a4f00e14e4c137f6d7c367774732deae25 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sat, 20 Oct 2018 03:45:34 +0200 Subject: [PATCH] Don't modify item tag if interaction is canceled @@ -12,7 +12,7 @@ This fixes a bug where tools lose durability when the interaction is canceled an where tools become completely repaired when they should break but the interaction was canceled. diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 4d29cb8d8..cb77bc8a5 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -168,6 +168,7 @@ public final class ItemStack { diff --git a/Spigot-Server-Patches/0396-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0395-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 97% rename from Spigot-Server-Patches/0396-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to Spigot-Server-Patches/0395-Add-option-to-prevent-players-from-moving-into-unloa.patch index 2b8e96103d..1378ae4f68 100644 --- a/Spigot-Server-Patches/0396-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0395-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -1,4 +1,4 @@ -From b11f5d117ae187d77bf6ebab8612110d6c48ba17 Mon Sep 17 00:00:00 2001 +From 4516b9be263260fb65341432f950a807df444661 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Mon, 22 Oct 2018 17:34:10 +0200 Subject: [PATCH] Add option to prevent players from moving into unloaded @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f94fa5df..1a8a9026 100644 +index f94fa5df2..1a8a90261 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -562,4 +562,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index f94fa5df..1a8a9026 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 1e7f980e..4c1f17f8 100644 +index f54cf3802..5c1735163 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -342,6 +342,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0397-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0396-Reset-players-airTicks-on-respawn.patch similarity index 89% rename from Spigot-Server-Patches/0397-Reset-players-airTicks-on-respawn.patch rename to Spigot-Server-Patches/0396-Reset-players-airTicks-on-respawn.patch index 8b07f34418..2a3a899cc0 100644 --- a/Spigot-Server-Patches/0397-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0396-Reset-players-airTicks-on-respawn.patch @@ -1,11 +1,11 @@ -From f5e154fd54294d6b6a9d97dd7492bd2fcddfb725 Mon Sep 17 00:00:00 2001 +From b966c253c53ed96502ebb4de7bb0a0d9682bd6dc Mon Sep 17 00:00:00 2001 From: GreenMeanie Date: Sat, 20 Oct 2018 22:34:02 -0400 Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d60dab95f3..32b90f30d9 100644 +index d60dab95f..32b90f30d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2335,7 +2335,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index d60dab95f3..32b90f30d9 100644 } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 7bbcaba053..4490b63258 100644 +index 7bbcaba05..4490b6325 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1619,6 +1619,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0398-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0397-Strip-private-area-unicode-characters-from-signs.patch similarity index 97% rename from Spigot-Server-Patches/0398-Strip-private-area-unicode-characters-from-signs.patch rename to Spigot-Server-Patches/0397-Strip-private-area-unicode-characters-from-signs.patch index c6d0c15cbf..9f786f5d6e 100644 --- a/Spigot-Server-Patches/0398-Strip-private-area-unicode-characters-from-signs.patch +++ b/Spigot-Server-Patches/0397-Strip-private-area-unicode-characters-from-signs.patch @@ -1,4 +1,4 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From e07c285c4be3bbc081ce1a4dd03d2884557c5d25 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 23 Oct 2018 20:53:43 -0400 Subject: [PATCH] Strip private area unicode characters from signs @@ -20,7 +20,7 @@ think of no reason to use it. Fixes GH-1571 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index 20dc3f272..3c712fc93 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -11,6 +11,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { diff --git a/Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0398-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 96% rename from Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to Spigot-Server-Patches/0398-Don-t-sleep-after-profile-lookups-if-not-needed.patch index 1b3e6347ee..f35b0613be 100644 --- a/Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0398-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From 59ba59cc95b4a0887b189efc1012a2c294a29e9d Mon Sep 17 00:00:00 2001 +From d5f1d78fb2a5d63b07ed6a9a41bf517aba824599 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 20:25:05 -0400 Subject: [PATCH] Don't sleep after profile lookups if not needed diff --git a/Spigot-Server-Patches/0400-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0399-Use-more-reasonable-thread-count-default-for-bootstr.patch similarity index 91% rename from Spigot-Server-Patches/0400-Use-more-reasonable-thread-count-default-for-bootstr.patch rename to Spigot-Server-Patches/0399-Use-more-reasonable-thread-count-default-for-bootstr.patch index f5ad5599c0..438ff20ec9 100644 --- a/Spigot-Server-Patches/0400-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0399-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,11 +1,11 @@ -From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 +From 8f2fdc5080f1ed159479a906fff4089c524d6c5f Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 23:14:38 -0400 Subject: [PATCH] Use more reasonable thread count default for bootstrap diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java -index 7ac07ac07ac0..7ac07ac07ac0 100644 +index e15b6da82..021fc0fc1 100644 --- a/src/main/java/net/minecraft/server/DataConverterRegistry.java +++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java @@ -22,7 +22,7 @@ public class DataConverterRegistry { diff --git a/Spigot-Server-Patches/0401-Use-EntityTypes-for-living-entities.patch b/Spigot-Server-Patches/0400-Use-EntityTypes-for-living-entities.patch similarity index 97% rename from Spigot-Server-Patches/0401-Use-EntityTypes-for-living-entities.patch rename to Spigot-Server-Patches/0400-Use-EntityTypes-for-living-entities.patch index dde04d7177..72a28e4f53 100644 --- a/Spigot-Server-Patches/0401-Use-EntityTypes-for-living-entities.patch +++ b/Spigot-Server-Patches/0400-Use-EntityTypes-for-living-entities.patch @@ -1,11 +1,11 @@ -From 6ede37a22fddb3a680a3d94bd5c2ef6f8c564c2e Mon Sep 17 00:00:00 2001 +From 12a5042eaaa93ff7312841c8d10ce410da3c0247 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 4 Oct 2018 10:08:02 -0500 Subject: [PATCH] Use EntityTypes for living entities diff --git a/src/main/java/net/minecraft/server/BlockMonsterEggs.java b/src/main/java/net/minecraft/server/BlockMonsterEggs.java -index 5a0cc6d0..d385f647 100644 +index 5a0cc6d05..d385f647e 100644 --- a/src/main/java/net/minecraft/server/BlockMonsterEggs.java +++ b/src/main/java/net/minecraft/server/BlockMonsterEggs.java @@ -35,7 +35,7 @@ public class BlockMonsterEggs extends Block { @@ -18,7 +18,7 @@ index 5a0cc6d0..d385f647 100644 entitysilverfish.setPositionRotation((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F); world.addEntity(entitysilverfish, SpawnReason.SILVERFISH_BLOCK); // CraftBukkit - add SpawnReason diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java -index f7ea9f9b..dfa3bd68 100644 +index f7ea9f9b8..dfa3bd685 100644 --- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java +++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java @@ -52,7 +52,7 @@ public class BlockPumpkinCarved extends BlockFacingHorizontal { @@ -40,7 +40,7 @@ index f7ea9f9b..dfa3bd68 100644 entityirongolem.setPlayerCreated(true); entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F); diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java -index 924d1564..9e9fa7d5 100644 +index 924d15649..9e9fa7d58 100644 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java @@ -84,7 +84,7 @@ public class BlockTurtleEgg extends Block { @@ -53,7 +53,7 @@ index 924d1564..9e9fa7d5 100644 entityturtle.setAgeRaw(-24000); entityturtle.g(blockposition); diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java -index 7904b126..38fc40e5 100644 +index 7904b1262..38fc40e50 100644 --- a/src/main/java/net/minecraft/server/BlockWitherSkull.java +++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java @@ -52,7 +52,7 @@ public class BlockWitherSkull extends BlockSkull { @@ -66,7 +66,7 @@ index 7904b126..38fc40e5 100644 entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F); diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java -index f4a8a4b4..3d5801dd 100644 +index f4a8a4b4d..3d5801dd8 100644 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java @@ -414,7 +414,7 @@ public class EnderDragonBattle { @@ -79,7 +79,7 @@ index f4a8a4b4..3d5801dd 100644 entityenderdragon.getDragonControllerManager().setControllerPhase(DragonControllerPhase.a); entityenderdragon.setPositionRotation(0.0D, 128.0D, 0.0D, this.d.random.nextFloat() * 360.0F, 0.0F); diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java -index efb728d0..3bfbf475 100644 +index efb728d04..3bfbf4752 100644 --- a/src/main/java/net/minecraft/server/EntityChicken.java +++ b/src/main/java/net/minecraft/server/EntityChicken.java @@ -96,7 +96,7 @@ public class EntityChicken extends EntityAnimal { @@ -92,7 +92,7 @@ index efb728d0..3bfbf475 100644 public boolean f(ItemStack itemstack) { diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index b2e50f85..9c7bf12b 100644 +index b2e50f853..9c7bf12b8 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -88,7 +88,7 @@ public class EntityCow extends EntityAnimal { @@ -105,7 +105,7 @@ index b2e50f85..9c7bf12b 100644 public float getHeadHeight() { diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java -index c82b5f3a..ba53e9b0 100644 +index c82b5f3ab..ba53e9b0b 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -74,7 +74,7 @@ public class EntityEnderPearl extends EntityProjectile { @@ -118,7 +118,7 @@ index c82b5f3a..ba53e9b0 100644 entityendermite.a(true); entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch); diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java -index 2d9631c5..16d94fe3 100644 +index 2d9631c5d..16d94fe3f 100644 --- a/src/main/java/net/minecraft/server/EntityEvoker.java +++ b/src/main/java/net/minecraft/server/EntityEvoker.java @@ -221,7 +221,7 @@ public class EntityEvoker extends EntityIllagerWizard { @@ -131,7 +131,7 @@ index 2d9631c5..16d94fe3 100644 entityvex.prepare(EntityEvoker.this.world.getDamageScaler(blockposition), (GroupDataEntity)null, (NBTTagCompound)null); entityvex.a(EntityEvoker.this); diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java -index 51a07311..f2019638 100644 +index 51a07311f..f20196388 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java @@ -205,10 +205,10 @@ public class EntityHorse extends EntityHorseAbstract { @@ -148,7 +148,7 @@ index 51a07311..f2019638 100644 int i; if (j < 4) { diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java -index 50c0a827..627ba103 100644 +index 50c0a8277..627ba1038 100644 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java @@ -38,7 +38,7 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract { @@ -161,7 +161,7 @@ index 50c0a827..627ba103 100644 return (EntityAgeable)object; } diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index ba6c0e96..17850e85 100644 +index ba6c0e96a..17850e857 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -134,7 +134,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -174,7 +174,7 @@ index ba6c0e96..17850e85 100644 public boolean a(EntityHuman entityhuman, EnumHand enumhand) { diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java -index 560eac4a..4b928d2c 100644 +index 560eac4af..4b928d2c7 100644 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java @@ -40,7 +40,7 @@ public class EntityHorseZombie extends EntityHorseAbstract { @@ -187,7 +187,7 @@ index 560eac4a..4b928d2c 100644 public boolean a(EntityHuman entityhuman, EnumHand enumhand) { diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index 774e4d64..0cf53b69 100644 +index 774e4d641..0cf53b69f 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -272,7 +272,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -200,7 +200,7 @@ index 774e4d64..0cf53b69 100644 EntityLlama entityllama2 = (EntityLlama)entityageable; int i = this.random.nextInt(Math.max(this.getStrength(), entityllama2.getStrength())) + 1; diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index 8ba9f3bb..c12b37f5 100644 +index 8ba9f3bb1..c12b37f52 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -40,7 +40,7 @@ public class EntityMushroomCow extends EntityCow { @@ -222,7 +222,7 @@ index 8ba9f3bb..c12b37f5 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index d2e25f04..90a7e00a 100644 +index d2e25f04b..90a7e00a0 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -154,7 +154,7 @@ public class EntityOcelot extends EntityTameableAnimal { @@ -244,7 +244,7 @@ index d2e25f04..90a7e00a 100644 entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entityocelot.setAgeRaw(-24000); diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 23668ada..6295cd95 100644 +index 23668ada3..6295cd95d 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -153,7 +153,7 @@ public class EntityPig extends EntityAnimal { @@ -266,7 +266,7 @@ index 23668ada..6295cd95 100644 public boolean f(ItemStack itemstack) { diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java -index b9124a5b..cb3e45f1 100644 +index b9124a5b0..cb3e45f14 100644 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java @@ -15,7 +15,7 @@ public class EntityPolarBear extends EntityAnimal { @@ -279,7 +279,7 @@ index b9124a5b..cb3e45f1 100644 public boolean f(ItemStack var1) { diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index b8ca5300..747409af 100644 +index b8ca53003..747409af0 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -251,7 +251,7 @@ public class EntityRabbit extends EntityAnimal { @@ -292,7 +292,7 @@ index b8ca5300..747409af 100644 if (this.random.nextInt(20) != 0) { diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java -index 4a9a9f9d..db4c3aa6 100644 +index 4a9a9f9da..db4c3aa60 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -264,7 +264,7 @@ public class EntitySheep extends EntityAnimal { @@ -305,7 +305,7 @@ index 4a9a9f9d..db4c3aa6 100644 entitysheep1.setColor(this.a((EntityAnimal) this, (EntityAnimal) entitysheep)); return entitysheep1; diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java -index 761c94bd..ffbd572d 100644 +index 761c94bdf..ffbd572dd 100644 --- a/src/main/java/net/minecraft/server/EntitySpider.java +++ b/src/main/java/net/minecraft/server/EntitySpider.java @@ -111,7 +111,7 @@ public class EntitySpider extends EntityMonster { @@ -318,7 +318,7 @@ index 761c94bd..ffbd572d 100644 entityskeleton.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null); diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 2c1db9b7..0d88314d 100644 +index 2c1db9b78..0d88314de 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -218,7 +218,7 @@ public class EntityTurtle extends EntityAnimal { @@ -331,7 +331,7 @@ index 2c1db9b7..0d88314d 100644 public boolean f(ItemStack itemstack) { diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 6b6fbfd7..29d5ef4c 100644 +index 6b6fbfd79..29d5ef4c1 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -269,6 +269,7 @@ public class EntityTypes { @@ -343,7 +343,7 @@ index 6b6fbfd7..29d5ef4c 100644 public T a(World world) { return this.aT.apply(world); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 868d2483..fbf78edd 100644 +index 868d24830..fbf78edd3 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -598,7 +598,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { @@ -365,7 +365,7 @@ index 868d2483..fbf78edd 100644 // Paper start if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) { diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index af9aef76..68db6af6 100644 +index af9aef76f..68db6af62 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -343,7 +343,7 @@ public class EntityWolf extends EntityTameableAnimal { @@ -378,7 +378,7 @@ index af9aef76..68db6af6 100644 if (uuid != null) { diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 4b326bf6..69a12bab 100644 +index 4b326bf6a..69a12bab3 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -216,7 +216,7 @@ public class EntityZombie extends EntityMonster { @@ -418,7 +418,7 @@ index 4b326bf6..69a12bab 100644 entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null); diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java -index 85d40296..0cca7b6d 100644 +index 85d402965..0cca7b6d5 100644 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java @@ -54,7 +54,7 @@ public class EntityZombieHusk extends EntityZombie { @@ -431,7 +431,7 @@ index 85d40296..0cca7b6d 100644 } diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 0e5dd111..c11e2745 100644 +index 0e5dd1116..c11e2745a 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -118,7 +118,7 @@ public class EntityZombieVillager extends EntityZombie { @@ -444,7 +444,7 @@ index 0e5dd111..c11e2745 100644 entityvillager.u(this); entityvillager.setProfession(this.getProfession()); diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java -index 9e407814..a4fab5c2 100644 +index 9e4078148..a4fab5c23 100644 --- a/src/main/java/net/minecraft/server/ItemArmorStand.java +++ b/src/main/java/net/minecraft/server/ItemArmorStand.java @@ -34,7 +34,7 @@ public class ItemArmorStand extends Item { @@ -457,7 +457,7 @@ index 9e407814..a4fab5c2 100644 entityarmorstand.setPositionRotation(d0 + 0.5D, d1, d2 + 0.5D, f, 0.0F); diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java -index 413188e9..476b840a 100644 +index 413188e97..476b840ae 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java @@ -59,7 +59,7 @@ public class MobSpawnerPhantom { @@ -470,7 +470,7 @@ index 413188e9..476b840a 100644 entityphantom.setPositionRotation(blockposition1, 0.0F, 0.0F); groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java -index d4fdcbdf..887e4461 100644 +index d4fdcbdfd..887e4461f 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java @@ -36,7 +36,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal { @@ -492,7 +492,7 @@ index d4fdcbdf..887e4461 100644 entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null); entityskeleton.setPosition(entityhorseabstract.locX, entityhorseabstract.locY, entityhorseabstract.locZ); diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java -index 560edb52..f9b58b97 100644 +index 560edb523..f9b58b972 100644 --- a/src/main/java/net/minecraft/server/VillageSiege.java +++ b/src/main/java/net/minecraft/server/VillageSiege.java @@ -134,7 +134,7 @@ public class VillageSiege { @@ -505,7 +505,7 @@ index 560edb52..f9b58b97 100644 } catch (Exception exception) { exception.printStackTrace(); diff --git a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java -index d5391159..83f55adb 100644 +index d53911594..83f55adba 100644 --- a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java +++ b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java @@ -174,7 +174,7 @@ public class WorldGenEndCityPieces { @@ -527,7 +527,7 @@ index d5391159..83f55adb 100644 entityshulker.g(blockposition); generatoraccess.addEntity(entityshulker); diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java -index 50fe0e16..ceb37aab 100644 +index 50fe0e16b..ceb37aab4 100644 --- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java @@ -146,7 +146,7 @@ public class WorldGenFeatureOceanRuinPieces { @@ -540,7 +540,7 @@ index 50fe0e16..ceb37aab 100644 entitydrowned.setPositionRotation(blockposition, 0.0F, 0.0F); entitydrowned.prepare(generatoraccess.getDamageScaler(blockposition), (GroupDataEntity)null, (NBTTagCompound)null); diff --git a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java -index 6ab249ee..c9a17e33 100644 +index 6ab249ee7..c9a17e332 100644 --- a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java +++ b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java @@ -37,7 +37,7 @@ public class WorldGenMonumentPieces { @@ -580,7 +580,7 @@ index 6ab249ee..c9a17e33 100644 for(WorldGenMonumentPieces.WorldGenMonumentStateTracker worldgenmonumentpieces$worldgenmonumentstatetracker4 : aworldgenmonumentpieces$worldgenmonumentstatetracker) { if (worldgenmonumentpieces$worldgenmonumentstatetracker4 != null) { diff --git a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java -index e327e2a2..c63b535e 100644 +index e327e2a28..c63b535ee 100644 --- a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java +++ b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java @@ -1656,7 +1656,7 @@ public class WorldGenVillagePieces { @@ -602,7 +602,7 @@ index e327e2a2..c63b535e 100644 entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F); entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6))); diff --git a/src/main/java/net/minecraft/server/WorldGenWitchHut.java b/src/main/java/net/minecraft/server/WorldGenWitchHut.java -index a05e0657..7062b0ce 100644 +index a05e0657b..7062b0cec 100644 --- a/src/main/java/net/minecraft/server/WorldGenWitchHut.java +++ b/src/main/java/net/minecraft/server/WorldGenWitchHut.java @@ -81,7 +81,7 @@ public class WorldGenWitchHut extends WorldGenScatteredPiece { @@ -615,7 +615,7 @@ index a05e0657..7062b0ce 100644 entitywitch.di(); entitywitch.setPositionRotation((double) i + 0.5D, (double) j, (double) k + 0.5D, 0.0F, 0.0F); diff --git a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java -index ee401980..9ca9306d 100644 +index ee401980f..9ca9306d0 100644 --- a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java +++ b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java @@ -197,7 +197,7 @@ public class WorldGenWoodlandMansionPieces { @@ -686,7 +686,7 @@ index ee401980..9ca9306d 100644 entityvindicator.setPositionRotation(blockposition, 0.0F, 0.0F); entityvindicator.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityvindicator)), (GroupDataEntity)null, (NBTTagCompound)null); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 818e4c37..4f9029c3 100644 +index 818e4c376..4f9029c33 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -511,7 +511,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -699,7 +699,7 @@ index 818e4c37..4f9029c3 100644 entityhorseskeleton.s(true); entityhorseskeleton.setAgeRaw(0); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 10fa1225..bd118f7f 100644 +index 10fa12253..bd118f7f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1172,153 +1172,153 @@ public class CraftWorld implements World { @@ -915,5 +915,5 @@ index 10fa1225..bd118f7f 100644 if (entity != null) { -- -2.17.1 +2.19.1 diff --git a/Spigot-Server-Patches/0402-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0401-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch similarity index 96% rename from Spigot-Server-Patches/0402-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch rename to Spigot-Server-Patches/0401-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch index 6d541a0206..e65321a3dd 100644 --- a/Spigot-Server-Patches/0402-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch +++ b/Spigot-Server-Patches/0401-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch @@ -1,4 +1,4 @@ -From 4b3504dfbcfdcfe361c11919ea7c6597f05b2d5d Mon Sep 17 00:00:00 2001 +From 7f5b0bc3f6a6548490c41d8035e88dc1aac0d159 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Thu, 1 Nov 2018 14:50:05 -0700 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block diff --git a/Spigot-Server-Patches/0403-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0402-Optimize-World-Time-Updates.patch similarity index 96% rename from Spigot-Server-Patches/0403-Optimize-World-Time-Updates.patch rename to Spigot-Server-Patches/0402-Optimize-World-Time-Updates.patch index c461c21c56..ec6e9087be 100644 --- a/Spigot-Server-Patches/0403-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0402-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From 8838e397dcd918185714a7417cbdf068efcb8f89 Mon Sep 17 00:00:00 2001 +From 49ff6e6c0df56f2e644f8d82ce6ec6448615e4d4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates @@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet object for every player unless they have per-player time enabled. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 69b3218756..e47918b3db 100644 +index 5049595ab..9c8c3304e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1038,12 +1038,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati diff --git a/Spigot-Server-Patches/0404-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0403-Restore-custom-InventoryHolder-support.patch similarity index 96% rename from Spigot-Server-Patches/0404-Restore-custom-InventoryHolder-support.patch rename to Spigot-Server-Patches/0403-Restore-custom-InventoryHolder-support.patch index 236ea62d74..8f776dbcac 100644 --- a/Spigot-Server-Patches/0404-Restore-custom-InventoryHolder-support.patch +++ b/Spigot-Server-Patches/0403-Restore-custom-InventoryHolder-support.patch @@ -1,4 +1,4 @@ -From 8cc37885f23c80ab3c775d97e07067eda0003804 Mon Sep 17 00:00:00 2001 +From a49502b8aac85700c7893c07d94f576e0301e757 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 5 Nov 2018 04:23:51 +0000 Subject: [PATCH] Restore custom InventoryHolder support diff --git a/Spigot-Server-Patches/0405-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0404-Use-Vanilla-Minecart-Speeds.patch similarity index 94% rename from Spigot-Server-Patches/0405-Use-Vanilla-Minecart-Speeds.patch rename to Spigot-Server-Patches/0404-Use-Vanilla-Minecart-Speeds.patch index 35bc65e3ea..c093b9e6a1 100644 --- a/Spigot-Server-Patches/0405-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0404-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From 34af573235b8c48ef22c9c32a4d3af78aa1cb27c Mon Sep 17 00:00:00 2001 +From 137bc6f72feba5616a393925792550a0632d2ae1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 8 Nov 2018 21:33:09 -0500 Subject: [PATCH] Use Vanilla Minecart Speeds diff --git a/Spigot-Server-Patches/0406-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0405-Fix-SpongeAbsortEvent-handling.patch similarity index 96% rename from Spigot-Server-Patches/0406-Fix-SpongeAbsortEvent-handling.patch rename to Spigot-Server-Patches/0405-Fix-SpongeAbsortEvent-handling.patch index 39c902dcac..1e62eaaed0 100644 --- a/Spigot-Server-Patches/0406-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0405-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From e4c6cfba0a9d7a230136cd8c443ae90da6de020c Mon Sep 17 00:00:00 2001 +From 17003f4fd29872c2beeb6ed2cb706e4b17116e6f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Nov 2018 05:15:21 +0000 Subject: [PATCH] Fix SpongeAbsortEvent handling diff --git a/Spigot-Server-Patches/0407-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0406-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 92% rename from Spigot-Server-Patches/0407-Don-t-allow-digging-into-unloaded-chunks.patch rename to Spigot-Server-Patches/0406-Don-t-allow-digging-into-unloaded-chunks.patch index 70509e3e02..15e9ab77a1 100644 --- a/Spigot-Server-Patches/0407-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0406-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,11 +1,11 @@ -From 5d091daf86e8d339005c2bcfbcc51746acc4b52b Mon Sep 17 00:00:00 2001 +From 0e8adf94dcf160bf8190be6477b69d482cc31fc8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Nov 2018 21:01:09 +0000 Subject: [PATCH] Don't allow digging into unloaded chunks diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4c1f17f82..3427e95e6 100644 +index 5c1735163..f1645b3ea 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1229,6 +1229,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0408-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0407-Optimize-redstone-algorithm.patch similarity index 99% rename from Spigot-Server-Patches/0408-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0407-Optimize-redstone-algorithm.patch index 22044c0803..dd19fd64d8 100644 --- a/Spigot-Server-Patches/0408-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0407-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From d86c84eaf859b8946d009e18c515d55abbbaeee5 Mon Sep 17 00:00:00 2001 +From eed8d2404e12eb84f692a3fd1c50cd9a3a77d379 Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1a8a9026..69b42be4 100644 +index 1a8a90261..69b42be4e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -567,4 +567,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index 1a8a9026..69b42be4 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java new file mode 100644 -index 00000000..21d9d6d7 +index 000000000..21d9d6d7e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,910 @@ @@ -954,7 +954,7 @@ index 00000000..21d9d6d7 + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 80bad675..3b45489a 100644 +index 80bad6755..3b45489a4 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1140,7 +1140,7 @@ index 80bad675..3b45489a 100644 iblockdata.a(world, blockposition, 0); world.setAir(blockposition); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7914f9b6..cdbb247d 100644 +index 7914f9b60..cdbb247da 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -646,6 +646,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0409-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0408-force-entity-dismount-during-teleportation.patch similarity index 98% rename from Spigot-Server-Patches/0409-force-entity-dismount-during-teleportation.patch rename to Spigot-Server-Patches/0408-force-entity-dismount-during-teleportation.patch index da35a26f77..601b6efd80 100644 --- a/Spigot-Server-Patches/0409-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0408-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From b709527bf3e22ad2416273246ca618681d32d8c7 Mon Sep 17 00:00:00 2001 +From 1462d0f3acca2f9b77ec924db2dcbc83ed2608b0 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 15 Nov 2018 13:38:37 +0000 Subject: [PATCH] force entity dismount during teleportation diff --git a/Spigot-Server-Patches/0410-Book-Size-Limits.patch b/Spigot-Server-Patches/0409-Book-Size-Limits.patch similarity index 96% rename from Spigot-Server-Patches/0410-Book-Size-Limits.patch rename to Spigot-Server-Patches/0409-Book-Size-Limits.patch index bcaf5da5d5..1e0a26fdcf 100644 --- a/Spigot-Server-Patches/0410-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0409-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From 5eab7e52ae72047453b934937e457646f4c6bfd3 Mon Sep 17 00:00:00 2001 +From 858c77b89ae39943f2efbba38eb54eb7d1ad57b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits @@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits Puts some limits on the size of books. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index bc74ea2f09..beec4e33c6 100644 +index bc74ea2f0..beec4e33c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -458,4 +458,11 @@ public class PaperConfig { @@ -22,7 +22,7 @@ index bc74ea2f09..beec4e33c6 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3427e95e60..462ab49762 100644 +index f1645b3ea..204d622f0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -750,6 +750,38 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0411-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0410-Make-the-default-permission-message-configurable.patch similarity index 94% rename from Spigot-Server-Patches/0411-Make-the-default-permission-message-configurable.patch rename to Spigot-Server-Patches/0410-Make-the-default-permission-message-configurable.patch index 2ea319614b..910bd0721f 100644 --- a/Spigot-Server-Patches/0411-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0410-Make-the-default-permission-message-configurable.patch @@ -1,11 +1,11 @@ -From 83381a58c6d6c970af932bbff81bd7fab6d6316b Mon Sep 17 00:00:00 2001 +From 7f38ad2f18a7a6661c4aeed9103a0c84a445e051 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:49:56 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index beec4e33c6..579726bb59 100644 +index beec4e33c..579726bb5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -21,6 +21,7 @@ import java.util.regex.Pattern; @@ -29,7 +29,7 @@ index beec4e33c6..579726bb59 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 648ac4d183..645953a310 100644 +index 648ac4d18..645953a31 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2146,6 +2146,10 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0412-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0411-Add-more-Zombie-API.patch similarity index 99% rename from Spigot-Server-Patches/0412-Add-more-Zombie-API.patch rename to Spigot-Server-Patches/0411-Add-more-Zombie-API.patch index 91a649ab2d..000c0d01d1 100644 --- a/Spigot-Server-Patches/0412-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0411-Add-more-Zombie-API.patch @@ -1,4 +1,4 @@ -From d58122dbc8ebdcf5628336834bff11c54919a0df Mon Sep 17 00:00:00 2001 +From d2ebaa99b142c7146e25f531dbac99888896534c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:59 -0500 Subject: [PATCH] Add more Zombie API diff --git a/Spigot-Server-Patches/0413-limit-the-range-at-which-we-ll-consider-an-attackabl.patch b/Spigot-Server-Patches/0412-limit-the-range-at-which-we-ll-consider-an-attackabl.patch similarity index 96% rename from Spigot-Server-Patches/0413-limit-the-range-at-which-we-ll-consider-an-attackabl.patch rename to Spigot-Server-Patches/0412-limit-the-range-at-which-we-ll-consider-an-attackabl.patch index c941ac7569..21ccc699d0 100644 --- a/Spigot-Server-Patches/0413-limit-the-range-at-which-we-ll-consider-an-attackabl.patch +++ b/Spigot-Server-Patches/0412-limit-the-range-at-which-we-ll-consider-an-attackabl.patch @@ -1,4 +1,4 @@ -From 9615b6f9aa28294eb6338baf0d29e2e5fc1921bb Mon Sep 17 00:00:00 2001 +From 50d165ee11c9aa5a54fa85581755461d424b7a55 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 13 Nov 2018 14:01:00 +0000 Subject: [PATCH] limit the range at which we'll consider an attackable target diff --git a/Spigot-Server-Patches/0414-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0413-Prevent-rayTrace-from-loading-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0414-Prevent-rayTrace-from-loading-chunks.patch rename to Spigot-Server-Patches/0413-Prevent-rayTrace-from-loading-chunks.patch index 2c8a7bae0d..0db2df32cb 100644 --- a/Spigot-Server-Patches/0414-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0413-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 9b79efe86e1e92e19577146c85b57c55561b1712 Mon Sep 17 00:00:00 2001 +From d36659fc24b2fb5cd2bba1f559f8572abe765ad8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Nov 2018 19:21:58 -0500 Subject: [PATCH] Prevent rayTrace from loading chunks @@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss this saves a ton of lag for when AI tries to raytrace near unloaded chunks. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 027871c00b..00773a9afa 100644 +index 027871c00..00773a9af 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -860,7 +860,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0415-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0414-Handle-Large-Packets-disconnecting-client.patch similarity index 98% rename from Spigot-Server-Patches/0415-Handle-Large-Packets-disconnecting-client.patch rename to Spigot-Server-Patches/0414-Handle-Large-Packets-disconnecting-client.patch index 69164147a3..d494e2c98e 100644 --- a/Spigot-Server-Patches/0415-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0414-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From 030ce5b54e606115c3cce607fea5ab7bdd669242 Mon Sep 17 00:00:00 2001 +From 75007b2ece9dba6d209f3398cefba8f55ac5e1a1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Nov 2018 21:18:06 -0500 Subject: [PATCH] Handle Large Packets disconnecting client diff --git a/work/Bukkit b/work/Bukkit index 9a793cce8c..0c1d258bb8 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 9a793cce8c9257ce85069c531486f369ad6328f1 +Subproject commit 0c1d258bb8185c39ce12c816a826973e94939b0e diff --git a/work/CraftBukkit b/work/CraftBukkit index ee6684bba7..6a398ac443 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit ee6684bba725a6d2f30422ae01041f3949ff2d76 +Subproject commit 6a398ac443ac411c2e1723eb9aaa1a38792c7645