From 64ed4298847a902f23bbb24b99b86e7d547d5855 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Sep 2020 19:47:58 -0400 Subject: [PATCH] (FIRST 1.16.3): Update Paper to 1.16.3 This is a pretty tiny update with very little changed. Recommended to update from 1.16.2 ASAP as 1.16.2 is now no longer supported. Plugins should mostly remain working as the NMS revision did not change. --- Paper-MojangAPI/pom.xml | 2 +- Spigot-API-Patches/0001-POM-changes.patch | 4 +-- .../0002-Add-FastUtil-to-Bukkit.patch | 2 +- .../0022-Use-ASM-for-event-executors.patch | 2 +- .../0053-PlayerAttemptPickupItemEvent.patch | 2 +- ...low-plugins-to-use-SLF4J-for-logging.patch | 2 +- ...-get-a-BlockState-without-a-snapshot.patch | 2 +- ...deadlock-risk-in-firing-async-events.patch | 2 +- .../0132-Async-Chunks-API.patch | 2 +- ...Blocks-to-be-accessed-via-a-long-key.patch | 2 +- ...-ray-tracing-methods-to-LivingEntity.patch | 2 +- ...155-Add-LivingEntity-getTargetEntity.patch | 2 +- Spigot-Server-Patches/0001-POM-Changes.patch | 8 ++--- .../0002-Paper-config-files.patch | 8 ++--- Spigot-Server-Patches/0003-MC-Dev-fixes.patch | 2 +- Spigot-Server-Patches/0004-MC-Utils.patch | 16 +++++----- ...-MinecraftKey-Information-to-Objects.patch | 2 +- ...to-current-Chunk-for-Entity-and-Bloc.patch | 2 +- Spigot-Server-Patches/0009-Timings-v2.patch | 30 +++++++++---------- ...012-Configurable-fishing-time-ranges.patch | 2 +- ...d-mobs-to-jump-and-take-water-damage.patch | 4 +-- ...-despawn-distances-for-living-entiti.patch | 2 +- ...5-Allow-for-toggling-of-spawn-chunks.patch | 2 +- ...ck-and-tnt-entities-at-the-specified.patch | 4 +-- ...ient-crashes-server-lists-and-Mojang.patch | 6 ++-- .../0018-Implement-Paper-VersionChecker.patch | 2 +- ...d-version-history-to-version-command.patch | 2 +- .../0020-Player-affects-spawning-API.patch | 4 +-- ...023-Further-improve-server-tick-loop.patch | 4 +-- .../0025-Entity-Origin-API.patch | 6 ++-- ...event-tile-entity-and-entity-crashes.patch | 2 +- ...nfigurable-top-of-nether-void-damage.patch | 4 +-- .../0030-Configurable-end-credits.patch | 2 +- .../0032-Optimize-explosions.patch | 6 ++-- .../0033-Disable-explosion-knockback.patch | 2 +- .../0034-Disable-thunder.patch | 2 +- .../0035-Disable-ice-and-snow.patch | 2 +- ...sition-the-first-time-an-entity-is-s.patch | 4 +-- ...figurable-container-update-tick-rate.patch | 2 +- .../0041-Disable-spigot-tick-limiters.patch | 2 +- .../0042-Add-PlayerInitialSpawnEvent.patch | 2 +- ...44-Ensure-commands-are-not-ran-async.patch | 2 +- .../0046-Expose-server-CommandMap.patch | 2 +- ...e-informative-in-maxHealth-exception.patch | 2 +- ...entation-of-tile-entity-removal-list.patch | 2 +- ...dd-configurable-portal-search-radius.patch | 4 +-- .../0052-Add-velocity-warnings.patch | 2 +- .../0054-Add-exception-reporting-event.patch | 2 +- ...oreboards-for-non-players-by-default.patch | 4 +-- ...working-with-arrows-stuck-in-living-.patch | 2 +- ...ading-permissions.yml-before-plugins.patch | 2 +- ...llow-Reloading-of-Custom-Permissions.patch | 2 +- .../0062-Remove-Metadata-on-reload.patch | 2 +- .../0065-Add-World-Util-Methods.patch | 4 +-- ...6-Custom-replacement-for-eaten-items.patch | 8 ++--- ...th-absorb-values-and-repair-bad-data.patch | 4 +-- ...069-Use-a-Shared-Random-for-Entities.patch | 4 +-- ...le-spawn-chances-for-skeleton-horses.patch | 2 +- ...Location-getType-and-getBlockData-fo.patch | 4 +-- ...ckPhysicsEvent-if-a-plugin-has-a-lis.patch | 6 ++-- ...Entity-AddTo-RemoveFrom-World-Events.patch | 2 +- .../0075-EntityPathfindEvent.patch | 10 +++---- ...7-Do-not-load-chunks-for-Pathfinding.patch | 4 +-- ...dDebugInfo-not-initialized-on-client.patch | 2 +- ...g-BlockPlaceEvent-triggering-physics.patch | 2 +- ...Remove-unused-World-Tile-Entity-List.patch | 4 +-- .../0087-Configurable-Player-Collision.patch | 2 +- ...91-Implement-PlayerLocaleChangeEvent.patch | 2 +- ...ityRegainHealthEvent-isFastRegen-API.patch | 2 +- ...-possibility-for-getServer-singleton.patch | 2 +- ...item-frames-performance-and-bug-fixe.patch | 2 +- ...-API-Replenishable-Lootables-Feature.patch | 2 +- .../0099-Optimize-UserCache-Thread-Safe.patch | 4 +-- ...1-Optional-TNT-doesn-t-move-in-water.patch | 4 +-- ...r-redstone-torch-rapid-clock-removal.patch | 2 +- .../0103-Add-server-name-parameter.patch | 2 +- .../0105-Fix-Double-World-Add-issues.patch | 2 +- ...setting-for-proxy-online-mode-status.patch | 2 +- .../0112-Chunk-registration-fixes.patch | 2 +- ...uto-fix-bad-Y-levels-on-player-login.patch | 2 +- ...a-from-ArmorStand-and-SpawnEgg-items.patch | 2 +- ...118-Cache-user-authenticator-threads.patch | 2 +- ...0-Allow-Reloading-of-Command-Aliases.patch | 2 +- ...2-Don-t-let-fishinghooks-use-portals.patch | 2 +- ...vent-Pathfinding-out-of-World-Border.patch | 4 +-- ...imize-World.isLoaded-BlockPosition-Z.patch | 2 +- ...to-control-if-armour-stands-can-move.patch | 6 ++-- ...30-Properly-fix-item-duplication-bug.patch | 2 +- .../0132-Firework-API-s.patch | 2 +- ...llow-entities-to-ride-themselves-572.patch | 2 +- ...PI-for-Reason-Source-Triggering-play.patch | 8 ++--- .../0138-Cap-Entity-Collisions.patch | 6 ++-- .../0141-Do-not-let-armorstands-drown.patch | 4 +-- ...le-async-calls-to-restart-the-server.patch | 2 +- ...n-option-to-prevent-player-names-fro.patch | 2 +- ...oleAppender-for-console-improvements.patch | 12 ++++---- .../0148-Item-canEntityPickup.patch | 4 +-- .../0150-PlayerAttemptPickupItemEvent.patch | 2 +- .../0151-Add-UnknownCommandEvent.patch | 2 +- .../0152-Basic-PlayerProfile-API.patch | 2 +- .../0153-Shoulder-Entities-Release-API.patch | 2 +- .../0156-Entity-fromMobSpawner.patch | 2 +- .../0161-Fix-this-stupid-bullshit.patch | 2 +- ...64-Fix-MC-117075-TE-Unload-Lag-Spike.patch | 2 +- ...-a-custom-authentication-servers-dow.patch | 2 +- .../0166-LivingEntity-setKiller.patch | 4 +-- ...ams-to-redirect-System.out-err-to-lo.patch | 4 +-- ...n-prefixes-using-Log4J-configuration.patch | 2 +- ...-Include-Log4J2-SLF4J-implementation.patch | 2 +- .../0177-Add-PlayerArmorChangeEvent.patch | 6 ++-- ...rom-being-processed-when-the-player-.patch | 2 +- ...e-implementations-for-captured-block.patch | 2 +- ...-get-a-BlockState-without-a-snapshot.patch | 2 +- .../0181-AsyncTabCompleteEvent.patch | 2 +- ...8-PlayerNaturallySpawnCreaturesEvent.patch | 2 +- ...nt-extended-PaperServerListPingEvent.patch | 2 +- ...e-PlayerProfile-in-AsyncPreLoginEven.patch | 2 +- .../0202-Player.setPlayerProfile-API.patch | 2 +- .../0204-getPlayerUniqueId-API.patch | 2 +- ...d-method-to-open-already-placed-sign.patch | 2 +- ...ld.spawnParticle-API-and-add-Builder.patch | 2 +- ...e-shield-blocking-delay-configurable.patch | 8 ++--- .../0228-Improve-EntityShootBowEvent.patch | 4 +-- ...plement-EntityKnockbackByEntityEvent.patch | 4 +-- ...ivingEntity-Hand-Raised-Item-Use-API.patch | 6 ++-- .../0236-InventoryCloseEvent-Reason-API.patch | 4 +-- ...nilla-entity-warnings-for-duplicates.patch | 2 +- ...242-Use-asynchronous-Log4j-2-loggers.patch | 2 +- ...-more-information-to-Entity.toString.patch | 2 +- ...ies-option-to-debug-dupe-uuid-issues.patch | 6 ++-- ...t-armor-stands-from-doing-entity-loo.patch | 2 +- ...0-Vanished-players-don-t-have-rights.patch | 6 ++-- ...dd-some-Debug-to-Chunk-Entity-slices.patch | 2 +- ...revent-Saving-Bad-entities-to-chunks.patch | 2 +- ...ead-Entities-in-entityList-iteration.patch | 4 +-- ...57-Implement-Expanded-ArmorStand-API.patch | 17 +++-------- ...nd-make-tab-spam-limits-configurable.patch | 2 +- .../0261-Add-hand-to-bucket-events.patch | 4 +-- ...dd-Early-Warning-Feature-to-WatchDog.patch | 4 +-- ...67-Use-a-Queue-for-Queueing-Commands.patch | 2 +- ...Allow-disabling-armour-stand-ticking.patch | 8 ++--- ...274-Optimize-CraftBlockData-Creation.patch | 2 +- .../0276-Add-PhantomPreSpawnEvent.patch | 2 +- ...-ray-tracing-methods-to-LivingEntity.patch | 6 ++-- .../0282-Improve-death-events.patch | 10 +++---- .../0284-Mob-Pathfinding-API.patch | 12 ++++---- .../0297-Add-sun-related-API.patch | 2 +- Spigot-Server-Patches/0298-Turtle-API.patch | 2 +- ...tator-target-events-and-improve-impl.patch | 4 +-- ...1-Add-Velocity-IP-Forwarding-Support.patch | 2 +- ...event-players-from-moving-into-unloa.patch | 2 +- ...06-Reset-players-airTicks-on-respawn.patch | 4 +-- ...er-Thread-Pool-and-Thread-Priorities.patch | 2 +- .../0309-Optimize-World-Time-Updates.patch | 2 +- .../0311-Use-Vanilla-Minecart-Speeds.patch | 2 +- ...t-allow-digging-into-unloaded-chunks.patch | 4 +-- .../0314-Book-Size-Limits.patch | 2 +- ...ault-permission-message-configurable.patch | 2 +- ...entity-dismount-during-teleportation.patch | 8 ++--- ...-replace-OfflinePlayer-getLastPlayed.patch | 2 +- .../0323-Fix-PlayerEditBookEvent.patch | 2 +- ...vehicle-tracking-issue-on-disconnect.patch | 2 +- .../0327-BlockDestroyEvent.patch | 2 +- ...st-tick-at-start-of-drowning-process.patch | 2 +- ...338-Add-LivingEntity-getTargetEntity.patch | 8 ++--- .../0340-Entity-getEntitySpawnReason.patch | 4 +-- ...ity-Metadata-for-all-tracked-players.patch | 2 +- .../0345-Server-Tick-Events.patch | 2 +- ...0346-PlayerDeathEvent-getItemsToKeep.patch | 2 +- ...-Optimize-Captured-TileEntity-Lookup.patch | 2 +- .../0348-Add-Heightmap-API.patch | 2 +- ...l-to-changed-postToMainThread-method.patch | 2 +- ...isPrimaryThread-and-MinecraftServer-.patch | 4 +-- ...h-entity-loss-due-to-unloaded-chunks.patch | 2 +- .../0355-Duplicate-UUID-Resolve-Option.patch | 4 +-- ...le-Keep-Spawn-Loaded-range-per-world.patch | 4 +-- .../0360-Implement-CraftBlockSoundGroup.patch | 2 +- .../0366-incremental-chunk-saving.patch | 4 +-- Spigot-Server-Patches/0367-Anti-Xray.patch | 18 ++--------- ...-being-ticked-when-notifying-navigat.patch | 2 +- ...73-Asynchronous-chunk-IO-and-loading.patch | 4 +-- ...etChunkIfLoadedImmediately-in-places.patch | 6 ++-- .../0375-Reduce-sync-loads.patch | 4 +-- ...if-we-have-a-custom-Bukkit-generator.patch | 2 +- ...ement-optional-per-player-mob-spawns.patch | 2 +- ...revent-consuming-the-wrong-itemstack.patch | 8 ++--- ...386-Expose-the-internal-current-tick.patch | 2 +- ...-sneak-when-changing-worlds-MC-10657.patch | 2 +- ...or-when-player-hand-set-to-empty-typ.patch | 2 +- ...ftMagicNumbers.isSupportedApiVersion.patch | 2 +- .../0394-Optimize-Hoppers.patch | 4 +-- ...layerDeathEvent-shouldDropExperience.patch | 2 +- ...timise-IEntityAccess-getPlayerByUUID.patch | 2 +- .../0401-Lag-compensate-eating.patch | 12 ++++---- ...-Add-effect-to-block-break-naturally.patch | 2 +- .../0406-Entity-Activation-Range-2.0.patch | 20 ++++++------- ...x-items-vanishing-through-end-portal.patch | 2 +- ...e-getChunkAt-calls-for-loaded-chunks.patch | 2 +- ...ow-overriding-the-java-version-check.patch | 6 ++-- .../0412-Optimise-random-block-ticking.patch | 6 ++-- .../0413-Entity-Jump-API.patch | 6 ++-- ...n-to-nerf-pigmen-from-nether-portals.patch | 2 +- .../0415-Make-the-GUI-graph-fancier.patch | 2 +- ...17-Prevent-teleporting-dead-entities.patch | 2 +- ...-chance-of-villager-zombie-infection.patch | 2 +- ...imise-TickListServer-by-rewriting-it.patch | 2 +- ...spawn-settings-and-per-player-option.patch | 2 +- ...re-Entity-is-never-double-registered.patch | 4 +-- ...ering-entities-from-unloading-chunks.patch | 2 +- ...nnections-shouldn-t-hold-up-shutdown.patch | 2 +- ...-PlayerChunkMap-adds-crashing-server.patch | 2 +- ...ptimize-Collision-to-not-load-chunks.patch | 2 +- .../0430-Don-t-tick-dead-players.patch | 2 +- .../0433-Increase-Light-Queue-Size.patch | 2 +- ...asks-Speed-up-processing-of-chunk-lo.patch | 6 ++-- ...move-existing-players-to-world-spawn.patch | 2 +- ...-Add-tick-times-API-and-mspt-command.patch | 10 +++---- ...437-Expose-MinecraftServer-isRunning.patch | 2 +- ...Add-Raw-Byte-ItemStack-Serialization.patch | 2 +- ...ions-until-after-entity-ticking-is-d.patch | 2 +- .../0442-Improved-Watchdog-Support.patch | 10 +++---- .../0443-Optimize-Pathfinding.patch | 4 +-- ...vent-opening-inventories-when-frozen.patch | 2 +- ...-entity-collision-code-if-not-needed.patch | 4 +-- ...-Implement-Player-Client-Options-API.patch | 2 +- ...g-Broken-behavior-of-PlayerJoinEvent.patch | 2 +- ...Load-Chunks-for-Login-Asynchronously.patch | 4 +-- ...pawn-point-if-spawn-in-unloaded-worl.patch | 2 +- ...PlayerAttackEntityCooldownResetEvent.patch | 2 +- ...ntom-creative-and-insomniac-controls.patch | 2 +- ...m-duplication-issues-and-teleport-is.patch | 4 +-- .../0464-Implement-Brigadier-Mojang-API.patch | 4 +-- ...PickItem-Packet-and-kick-for-invalid.patch | 2 +- .../0467-Expose-game-version.patch | 2 +- ...-per-thread-native-byte-buffer-cache.patch | 2 +- .../0470-Implement-Mob-Goal-API.patch | 4 +-- ...tance-map-to-optimise-entity-tracker.patch | 6 ++-- ...-isOutsideRange-to-use-distance-maps.patch | 2 +- ...No-Tick-view-distance-implementation.patch | 6 ++-- ...7-Fix-PotionEffect-ignores-icon-flag.patch | 2 +- ...Wait-for-Async-Tasks-during-shutdown.patch | 4 +-- ...and-End-Portal-Frames-from-being-des.patch | 4 +-- ...llocation-of-Vec3D-by-entity-tracker.patch | 2 +- ...k-Priority-Urgency-System-for-Chunks.patch | 4 +-- ...ookup-for-Treasure-Maps-Fixes-lag-fr.patch | 2 +- .../0498-Optimize-Light-Engine.patch | 2 +- ...-Plugin-Tickets-to-API-Chunk-Methods.patch | 2 +- .../0504-Fix-sand-duping.patch | 2 +- ...-desync-in-playerconnection-causing-.patch | 2 +- ...12-Add-permission-for-command-blocks.patch | 4 +-- ...sure-Entity-AABB-s-are-never-invalid.patch | 2 +- ...WorldBorder-collision-checks-and-air.patch | 2 +- ...ld-Difficulty-Remembering-Difficulty.patch | 4 +-- .../0526-Add-entity-liquid-API.patch | 2 +- ...llow-delegation-to-vanilla-chunk-gen.patch | 2 +- ...k-for-portal-on-world-gen-entity-add.patch | 4 +-- ...-Vanilla-Command-permission-checking.patch | 2 +- ...ove-range-check-for-block-placing-up.patch | 2 +- .../0545-Incremental-player-saving.patch | 4 +-- ...turn-for-WorldServer-addAllEntitiesS.patch | 2 +- .../0557-Add-setMaxPlayers-API.patch | 2 +- ...yPickupItemAnimation-to-LivingEntity.patch | 2 +- ...geEvent-not-firing-for-all-use-cases.patch | 2 +- ...Add-zombie-targets-turtle-egg-config.patch | 2 +- .../0567-Optimize-redstone-algorithm.patch | 2 +- ...CreateEvent-needs-to-know-its-entity.patch | 2 +- .../0572-Add-more-Evoker-API.patch | 2 +- ...-translation-keys-for-blocks-entitie.patch | 6 ++-- .../0575-Cache-block-data-strings.patch | 2 +- ...ortation-and-cancel-velocity-if-tele.patch | 2 +- ...xception-when-cancelling-PortalCreat.patch | 2 +- work/BuildData | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 275 files changed, 459 insertions(+), 480 deletions(-) diff --git a/Paper-MojangAPI/pom.xml b/Paper-MojangAPI/pom.xml index 03a17db372..0ac10a3f00 100644 --- a/Paper-MojangAPI/pom.xml +++ b/Paper-MojangAPI/pom.xml @@ -10,7 +10,7 @@ com.destroystokyo.paper paper-mojangapi - 1.16.2-R0.1-SNAPSHOT + 1.16.3-R0.1-SNAPSHOT jar Paper-MojangAPI diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index f131cbc4df..ab0202684c 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 96687472e8a7799d0b32032026a7fc3a08f23ecc..af19075e6768aef0dcd9f54dc41f44fdd6a0e9d2 100644 +index 0bae36cf16a4aa0a59824246db5634b6c0f6e55c..75483fe1abe6fa26f69cb437aefee4a9d51e078f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,34 +2,28 @@ @@ -22,7 +22,7 @@ index 96687472e8a7799d0b32032026a7fc3a08f23ecc..af19075e6768aef0dcd9f54dc41f44fd - spigot-api + com.destroystokyo.paper + paper-api - 1.16.2-R0.1-SNAPSHOT + 1.16.3-R0.1-SNAPSHOT jar - Spigot-API diff --git a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch index 5a1c25baab..6d87f0bb6e 100644 --- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/pom.xml b/pom.xml -index af19075e6768aef0dcd9f54dc41f44fdd6a0e9d2..d15efd747442f20f0f6a8c22bb3ba45abdcd399b 100644 +index 75483fe1abe6fa26f69cb437aefee4a9d51e078f..598429db84ef69220099cf3b890b16c26666b5cc 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,12 @@ diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch index 4fdb207352..5986fb9695 100644 --- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index d15efd747442f20f0f6a8c22bb3ba45abdcd399b..f9ca0f2386049e48759646c1a38646db85c66492 100644 +index 598429db84ef69220099cf3b890b16c26666b5cc..8cc19e3da4598750c80c95b1153858049e07740f 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,17 @@ diff --git a/Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch index 65a491cfc9..6b504ae688 100644 --- a/Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..16318a3abbb1a279d779823fc9c9a1c32e0b5f42 +index 0000000000000000000000000000000000000000..0788153a9641e75da565d2e6eee37eeee1cbc61e --- /dev/null +++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java @@ -0,0 +1,90 @@ diff --git a/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch index bd862ae33d..4facb41d40 100644 --- a/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index f9ca0f2386049e48759646c1a38646db85c66492..1a34f6880b45e3c46a8e29575b549f3a601721e7 100644 +index 8cc19e3da4598750c80c95b1153858049e07740f..29dafd4b937e635bcce7b3712122ad3452fedfc2 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,13 @@ diff --git a/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch index 0f95b2be82..9d4f264793 100644 --- a/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch @@ -9,7 +9,7 @@ on the real tile entity. This is useful for where performance is needed diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 2ff77abef2b25c839ddd524aa29afbc4e49d0c31..633733d7c914cf6ae988f727d644c8f2be408b02 100644 +index 0cfad6f84eda6f7bfa1fae041341ccb1021b157d..e89c8079625525667f496c06207da655fe43d749 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -269,6 +269,16 @@ public interface Block extends Metadatable { diff --git a/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch index 697b83c690..a2e604604b 100644 --- a/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch +++ b/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch @@ -16,7 +16,7 @@ which results in a hard crash. This change removes the synchronize and adds some protection around enable/disable diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index d9922f0777d018f1e6c5673b9fc907fde3fbfa8d..f3dc2f7f45bea1a91171339a5d19461735845aee 100644 +index 8ab223674fe39e745bc6f24561ed71113182605b..5a8f833ddd488cb1d3f817aadbd67e9850b26681 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/Spigot-API-Patches/0132-Async-Chunks-API.patch b/Spigot-API-Patches/0132-Async-Chunks-API.patch index cb3ec03372..fbade52a47 100644 --- a/Spigot-API-Patches/0132-Async-Chunks-API.patch +++ b/Spigot-API-Patches/0132-Async-Chunks-API.patch @@ -480,7 +480,7 @@ index ff132bd7677e384debf2399ba9b1ffdb932541e9..a260f31d1bc00b6bd874185261700540 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index f3dc2f7f45bea1a91171339a5d19461735845aee..4a7b4112192f317b2feed9dfa7713155183578b6 100644 +index 5a8f833ddd488cb1d3f817aadbd67e9850b26681..06f41958b98d9f105a9735509b4eb50ebf0fbf60 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -156,6 +156,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch index 671c65a6d3..39c6968bc4 100644 --- a/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -91,7 +91,7 @@ index a260f31d1bc00b6bd87418526170054047977da4..14555ceda572ba1f720fafaab12ea39d * Gets the highest non-empty (impassable) coordinate at the given * coordinates. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 633733d7c914cf6ae988f727d644c8f2be408b02..d7c7df85228c01529e266ffdd3b3bcdc9ed35774 100644 +index e89c8079625525667f496c06207da655fe43d749..d6f74dbcfeb153d4b17be2827e2989f2d8160d21 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -153,6 +153,72 @@ public interface Block extends Metadatable { diff --git a/Spigot-API-Patches/0143-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0143-Add-ray-tracing-methods-to-LivingEntity.patch index 284a02349e..f60f980188 100644 --- a/Spigot-API-Patches/0143-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-API-Patches/0143-Add-ray-tracing-methods-to-LivingEntity.patch @@ -65,7 +65,7 @@ index 0000000000000000000000000000000000000000..18a96dbb01d3b34476652264b2d6be37 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 5f8a544574bbc095f2b2c06ccbf887d17af93475..c75ce8435ddef6502df1a57ca4b95186259a2a41 100644 +index e0f77cf3a3aa8a741f0ee5c077ff56e80605be76..0ad31337a03743a6ceec1c2b018fecc47b1be089 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -82,6 +82,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/Spigot-API-Patches/0155-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0155-Add-LivingEntity-getTargetEntity.patch index 154fabd97c..6f65bc5cde 100644 --- a/Spigot-API-Patches/0155-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-API-Patches/0155-Add-LivingEntity-getTargetEntity.patch @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..f52644fab1522bdf83ff4f489e9805b2 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index c75ce8435ddef6502df1a57ca4b95186259a2a41..cda3ab0924b27bcd3ccfec4b0eb19ef1c24f18fb 100644 +index 0ad31337a03743a6ceec1c2b018fecc47b1be089..0624099fcd28c7f108131cb0f58d323818379838 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -151,6 +151,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index b8df4a4c54..ad89209fc7 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 56c23681feafa2760740ad03cb7f5f274df6e20d..b8c8dc1a06a8ed93fccd419155fc9403805ea2fa 100644 +index 4bb337765331da509dd00ddebfaae5cb2b52db65..78c26572ab2ecdd554da38898f1c6c60e13e769c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ @@ -16,7 +16,7 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..b8c8dc1a06a8ed93fccd419155fc9403 - spigot + paper jar - 1.16.2-R0.1-SNAPSHOT + 1.16.3-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ + Paper @@ -27,7 +27,7 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..b8c8dc1a06a8ed93fccd419155fc9403 + UTF-8 unknown - 1.16.2 + 1.16.3 @@ -19,21 +18,27 @@ @@ -196,7 +196,7 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..b8c8dc1a06a8ed93fccd419155fc9403 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 93bc7535a68fbf8c2dd3b5e18cedbcbf140d60c4..113ea57fec3d71bd9842d27674eac6201d20c2d5 100644 +index 8a8234199e36da33cb94fdf030f9fc75dc0add44..9c98589c2db92720b4ae054ee74ef7ab0dac891a 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -186,7 +186,7 @@ public class Main { diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 1cd2da5d2c..60626978af 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -556,7 +556,7 @@ index f6335ed3eba55e939aa24b1eeb83026e61d92235..94b8cda9ce78aa22c14e88f3500bb981 } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index ca95b5aba2bdbd35ffec5327975d1b04a2b9b02a..7f3c6518cce96354cc2217e5e112ac426199ae9b 100644 +index 94a41f3f9ca90f28aefdecc38db0b853f983baf1..a48d17b18414aed3987041705615464bbe064d89 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -148,6 +148,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -633,7 +633,7 @@ index 4da97dbcf95b1e782ef80956c5d128972b2c3ed5..059b9634aeffc6f710d40112f5f8d9b8 Main.LOGGER.info("Forcing world upgrade! {}", convertable_conversionsession.getLevelName()); // CraftBukkit WorldUpgrader worldupgrader = new WorldUpgrader(convertable_conversionsession, datafixer, immutableset, flag); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ad7acac0a980c975b9e98f17b99ad801e9176291..a5c1f82dfc80c839c38fa6139b83d3aebeae9155 100644 +index 62134fdbdbdc044001940d069622ccce9bdfbee2..3150f4a0a8f1f8256c7e296f479b632b47bc6620 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -77,6 +77,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -654,7 +654,7 @@ index ad7acac0a980c975b9e98f17b99ad801e9176291..a5c1f82dfc80c839c38fa6139b83d3ae this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 46669f0b51bd9c2c5c2b721106b9e8e90b52b2c2..db5001cd4c601e35678181ba0ae66b3ed3cde124 100644 +index 12b53e204f178f4155fc9a32523708fbdfb69e95..e47ebe8093fe059a7ccec0161bbe0ec9bb0ac3bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -802,6 +802,7 @@ public final class CraftServer implements Server { @@ -718,7 +718,7 @@ index 46669f0b51bd9c2c5c2b721106b9e8e90b52b2c2..db5001cd4c601e35678181ba0ae66b3e + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 113ea57fec3d71bd9842d27674eac6201d20c2d5..4e5611beaa22a08573e373cc87e9a265c8bca5aa 100644 +index 9c98589c2db92720b4ae054ee74ef7ab0dac891a..f187c7d127c356861c30141efeafcef0057878ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -129,6 +129,14 @@ public class Main { diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index 4660a79203..3c6041237f 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -485,7 +485,7 @@ index 998101592723abb26c91d1f92e98be1cf24c954d..ee9069c744df63cbb7f21dd9d28d6d55 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 786c845275b61e1d64db150ac0226fe5a119ad2f..b1b55d16d4e3e7952d70acfccaad0efd3a948ef3 100644 +index db11a3eec10ff837dde5b535da33ab2df22a477d..952f7b345f4a50ead76706765b5f95a743dbbea4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1549,9 +1549,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index f7ebe8e05613e638dc1dd386f4cf9a48c7b1e2a7..1a29857b41713126e86131b6eac01f0190fa11e7 100644 +index d17f46801bc3df42a81e8738d53afb5249f30e53..d6ee588d8752a9c3561f1cc61c9dccce16f07207 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -51,7 +51,7 @@ import org.bukkit.event.player.PlayerTeleportEvent; diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch index 2a876b4ad2..5ef32571c4 100644 --- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch +++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch @@ -80,7 +80,7 @@ index 3b3e94cff2c6def318864bb5b7baefcf9de2cae7..6bd9457ad5c9fb1c0f12ff345b531be0 } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1a29857b41713126e86131b6eac01f0190fa11e7..fc6930327625bf951bb0ba21df5eb1a559a2b295 100644 +index d6ee588d8752a9c3561f1cc61c9dccce16f07207..aaeb862fd93110bc19e0c2e212f67a19d5462dbb 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -175,7 +175,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index c29ad73a51..884e75ee56 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -923,7 +923,7 @@ index 11891990d90b789192d9081787c1e844646121ae..2a48d85f0490991eb323ef550cb6148d int k = 0; CustomFunction.c[] acustomfunction_c = customfunction.b(); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 7f3c6518cce96354cc2217e5e112ac426199ae9b..4ef6913c356663b640e6ce770c123f51e6f3c057 100644 +index a48d17b18414aed3987041705615464bbe064d89..c9da9af05377a996048418c1bcb0b2f04c819d3a 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -28,7 +28,7 @@ import org.apache.logging.log4j.Level; @@ -1002,7 +1002,7 @@ index 7f3c6518cce96354cc2217e5e112ac426199ae9b..4ef6913c356663b640e6ce770c123f51 } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fc6930327625bf951bb0ba21df5eb1a559a2b295..7fe3c37feef31762014f0c77e1bbb3c3a12a0797 100644 +index aaeb862fd93110bc19e0c2e212f67a19d5462dbb..0f26aacfec892709052b7c2684b553ffe2e16ff6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -31,7 +31,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent; @@ -1038,7 +1038,7 @@ index fc6930327625bf951bb0ba21df5eb1a559a2b295..7fe3c37feef31762014f0c77e1bbb3c3 protected BlockPosition ao() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4..6f9fe8959e7ca47effead4ab2a59c75d4781eb00 100644 +index 2e9f8d55ea85615f1b61efef89ccc822df6a0cfb..083578259d0c428fb9439fcbb4b53ac59e9c390d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -42,7 +42,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -1050,7 +1050,7 @@ index 3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4..6f9fe8959e7ca47effead4ab2a59c75d public abstract class EntityLiving extends Entity { -@@ -2345,7 +2345,6 @@ public abstract class EntityLiving extends Entity { +@@ -2346,7 +2346,6 @@ public abstract class EntityLiving extends Entity { @Override public void tick() { @@ -1058,7 +1058,7 @@ index 3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4..6f9fe8959e7ca47effead4ab2a59c75d super.tick(); this.t(); this.v(); -@@ -2394,9 +2393,7 @@ public abstract class EntityLiving extends Entity { +@@ -2395,9 +2394,7 @@ public abstract class EntityLiving extends Entity { } } @@ -1068,7 +1068,7 @@ index 3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4..6f9fe8959e7ca47effead4ab2a59c75d double d0 = this.locX() - this.lastX; double d1 = this.locZ() - this.lastZ; float f = (float) (d0 * d0 + d1 * d1); -@@ -2476,8 +2473,6 @@ public abstract class EntityLiving extends Entity { +@@ -2477,8 +2474,6 @@ public abstract class EntityLiving extends Entity { if (this.isSleeping()) { this.pitch = 0.0F; } @@ -1077,7 +1077,7 @@ index 3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4..6f9fe8959e7ca47effead4ab2a59c75d } private void p() { -@@ -2659,7 +2654,6 @@ public abstract class EntityLiving extends Entity { +@@ -2660,7 +2655,6 @@ public abstract class EntityLiving extends Entity { this.setMot(d4, d5, d6); this.world.getMethodProfiler().enter("ai"); @@ -1085,7 +1085,7 @@ index 3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4..6f9fe8959e7ca47effead4ab2a59c75d if (this.isFrozen()) { this.jumping = false; this.aR = 0.0F; -@@ -2669,7 +2663,6 @@ public abstract class EntityLiving extends Entity { +@@ -2670,7 +2664,6 @@ public abstract class EntityLiving extends Entity { this.doTick(); this.world.getMethodProfiler().exit(); } @@ -1093,7 +1093,7 @@ index 3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4..6f9fe8959e7ca47effead4ab2a59c75d this.world.getMethodProfiler().exit(); this.world.getMethodProfiler().enter("jump"); -@@ -2704,9 +2697,9 @@ public abstract class EntityLiving extends Entity { +@@ -2705,9 +2698,9 @@ public abstract class EntityLiving extends Entity { this.r(); AxisAlignedBB axisalignedbb = this.getBoundingBox(); @@ -1105,7 +1105,7 @@ index 3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4..6f9fe8959e7ca47effead4ab2a59c75d this.world.getMethodProfiler().exit(); this.world.getMethodProfiler().enter("push"); if (this.bf > 0) { -@@ -2714,9 +2707,7 @@ public abstract class EntityLiving extends Entity { +@@ -2715,9 +2708,7 @@ public abstract class EntityLiving extends Entity { this.a(axisalignedbb, this.getBoundingBox()); } @@ -1168,7 +1168,7 @@ index ffb8685e7c457483bcf4b2ed1065fec0fbaa69e2..add85654783e9c3cebf2a2072cd2e076 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3976bf9a94657a5842a5ced06f3d12e108667dfc..bc7f74bae272d7cef681136ebdafed3d1a3df046 100644 +index 4e8d26b7e427e36dab6335855e3922865ab589cc..033633139b50f1d991ee6b18b8fb750225b52f34 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -65,7 +65,7 @@ import org.bukkit.craftbukkit.CraftServer; @@ -1631,7 +1631,7 @@ index 67fdd560f8136d83a13f75e265d5f5dd11871375..8f51a1e5e37566001e1d419065ce7307 private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); public CraftPersistentDataContainer persistentDataContainer; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 557a265712695180c4cb1cf49c4e0a5441554e86..86e7134a402d1c1e0df954c6ea862c6234836773 100644 +index f69c2055a33a9396e0df6554aa4e498ba0fd4e71..9836de9a748a5d7828d02a1831561f0d35d4b577 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,7 +18,6 @@ import org.apache.logging.log4j.Logger; @@ -1678,7 +1678,7 @@ index 557a265712695180c4cb1cf49c4e0a5441554e86..86e7134a402d1c1e0df954c6ea862c62 CrashReport crashreport = CrashReport.a(throwable, "Ticking entity"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked"); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 56ba84a0fcd3e6a6e2dbd035f466112bf17c6845..3c917e814c05c1a6284d6a0d00ae31aed5d37ff0 100644 +index 4947a0aaab2dd91f3184365e64c4ad4e05132283..a807933d65a22dc1b15eda4dee819af72006fff3 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -2,6 +2,8 @@ package net.minecraft.server; @@ -1805,7 +1805,7 @@ index 56ba84a0fcd3e6a6e2dbd035f466112bf17c6845..3c917e814c05c1a6284d6a0d00ae31ae // CraftBukkit start - moved from MinecraftServer.saveChunks diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index db5001cd4c601e35678181ba0ae66b3ed3cde124..1727c9ab0bb9e5b18198f7089a320223f2297d88 100644 +index e47ebe8093fe059a7ccec0161bbe0ec9bb0ac3bc..374c1c82ed26fe0fb3519f4339708bc1e8386be9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2053,12 +2053,31 @@ public final class CraftServer implements Server { @@ -2202,7 +2202,7 @@ index e52ef47b783785dc214746b678e7b549aea9a274..3d90b3426873a3528af14f7f1ab0adae this.value = value; } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 1afaa2429995514fdaf2e2390e0545599ba4b3f4..9828935e0ab1d7bc9950f3d9225542af3d0bf5b5 100644 +index 4d8cd8234a65fc00badc2351e32210bd1a901f2f..931bdc2da33479991f4024c4f1a7dcc39f5d54d9 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -138,6 +138,12 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch index adadc6edda..32ca80da0e 100644 --- a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch @@ -22,7 +22,7 @@ index 912611cf1aeccf5a82a789aab07d76723d4357cc..7d9976ce6bf86e6fdfd0c7770104cee0 + } } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index b787c8a35c38aa944bcf0d849a1940bede88f86d..9928ba1d181eef8735ccd4e282719b4ca3d62bea 100644 +index e5d1911a6a7ee6aa9e6930cb196f652b27de6f09..cd095cee4f162e5c47c04a68c66a4eb743d95a3f 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -338,7 +338,7 @@ public class EntityFishingHook extends IProjectile { diff --git a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch index 429fe10d79..017e3c197f 100644 --- a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch +++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch @@ -31,7 +31,7 @@ index 2e869004c8c6b8bfbb002fb4eda04519d50390c8..22eb89df768819f0a18f91b806b56ace this.b.setJumping(this.a); this.a = false; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7fe3c37feef31762014f0c77e1bbb3c3a12a0797..b0dc450870483c0c97784a52c7d32d56e0a10fc4 100644 +index 0f26aacfec892709052b7c2684b553ffe2e16ff6..bf3173881a0884d105bca724f3c0b1323c355170 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1019,6 +1019,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -43,7 +43,7 @@ index 7fe3c37feef31762014f0c77e1bbb3c3a12a0797..b0dc450870483c0c97784a52c7d32d56 return this.isInWater() || this.isInRain() || this.k(); } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 5da6528672d0f14766ca99ce5d2cc40b5035896c..f56701240ab819d31bb631684a4ee49a9a28a19b 100644 +index abafe6d3ee2f2662f0c2b62cc697606b3d7b47e0..5df3ca8c0a272392cec2cf10b15494f9f63d171c 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -33,6 +33,7 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch index 93b17f6cc1..6f92c747e8 100644 --- a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch @@ -30,7 +30,7 @@ index 6d6a68cb1b952da8308ac9ce5b54694bc9ba0e30..2845686411615245137cfe1a155088a8 + } } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index d09faa237905a6d4ad39ece64f6db5079be655e1..0f28d047453b99a6dc051196642cedc86b3d657b 100644 +index 5df3ca8c0a272392cec2cf10b15494f9f63d171c..71e8d8c0c4c5ec1ebb67a4cf5ce3c751a5fd052a 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -698,14 +698,14 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch index 024ddc8115..704914bdec 100644 --- a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch @@ -20,7 +20,7 @@ index 2845686411615245137cfe1a155088a865a4d3a0..8ee2b9bb1bce698fce50ac1b3fc477fc + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 998eb1cadc40878ec6fda7963adcdf8c49154cea..1ad366de6d2857edb6d12006e8db11845cdf30d8 100644 +index 9836de9a748a5d7828d02a1831561f0d35d4b577..abdad96225985e5c216394f64d646755a3992333 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -165,6 +165,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch index b709c47a07..07faa7672d 100644 --- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch +++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch @@ -24,7 +24,7 @@ index 8ee2b9bb1bce698fce50ac1b3fc477fcafd0542c..d59b82b7bb1f6d1b231f4e394e0a67a3 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b0dc450870483c0c97784a52c7d32d56e0a10fc4..f76476fba765c04a19931a36d88d9cebcba93334 100644 +index bf3173881a0884d105bca724f3c0b1323c355170..6b209c203def177e0a47eba2db8c6af87f4a2a96 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1756,6 +1756,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -36,7 +36,7 @@ index b0dc450870483c0c97784a52c7d32d56e0a10fc4..f76476fba765c04a19931a36d88d9ceb public EntityItem a(ItemStack itemstack, float f) { if (itemstack.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index d80245492a89180f9cc7d8bc8a8e485ffa4ba174..e7efc540a9ec67e67714c9b3cfd2c24c0842e3f5 100644 +index 53f49e76fe54392b4bb905b6990835820397877d..fbb795ac767fee6d88cfa9f7f17c6a1f89bbbf2d 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -85,6 +85,17 @@ public class EntityFallingBlock extends Entity { 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 617193f6aa..2a3baef2d3 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 @@ -19,7 +19,7 @@ index aab33df7a36eb69300fedfce733985d6c239ca01..550232cb3819138b3bae0fa1c5142948 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bc7f74bae272d7cef681136ebdafed3d1a3df046..1148a81b74cf6e9d27e32c3a61cf423786daed16 100644 +index 033633139b50f1d991ee6b18b8fb750225b52f34..f2b3df4319a3b0348bc5185d841abf7c0e21d425 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1222,7 +1222,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant= 0 && i < this.list.size()) { NBTBase nbtbase = (NBTBase) this.list.get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3c917e814c05c1a6284d6a0d00ae31aed5d37ff0..dea829c3a568c0f78e8c4413c92f6fcc05297d8b 100644 +index a807933d65a22dc1b15eda4dee819af72006fff3..25a4bd5a216798d01da33e54da4ab0e27b86b463 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1129,6 +1129,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch index c9a491dd52..a446d8afb0 100644 --- a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch @@ -23,7 +23,7 @@ index 8f51a1e5e37566001e1d419065ce730768c1b342..950dc3de042159de9f667dcd2499f4ee } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1ad366de6d2857edb6d12006e8db11845cdf30d8..a65a5953bcd035ba8e73c97341adff06246d2601 100644 +index abdad96225985e5c216394f64d646755a3992333..d1158ffb4475372a0c372cc5b097923c0cbaad36 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -685,11 +685,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch index 67050437ea..7063713722 100644 --- a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch @@ -29,7 +29,7 @@ index d59b82b7bb1f6d1b231f4e394e0a67a3d154d7be..f7a0a33e49cadf9b2bd43f118c106937 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9f0ae86bbd26c151b371b399db92f527fc4b51d6..ad372904a42978be83a8588dd24c22d15a7bf5b6 100644 +index 4fb746f50ca8e41f2eb3a9c312ee21dcd6d9096d..ed1339cf67abb895eb23c8a6fd5f10b6389e4224 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -414,9 +414,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -67,7 +67,7 @@ index 9f0ae86bbd26c151b371b399db92f527fc4b51d6..ad372904a42978be83a8588dd24c22d1 this.die(); } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 4a646f6609b5a85060460d7f8511b7d2d20166f4..a033000a2c85043822b7cab0dee796043ce2520f 100644 +index 5e41e9527a966b2fa935ab5ae266cbbedf6fc114..f04e0dbe544b5dc0e40e37c4159a4f26fa149845 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -292,9 +292,15 @@ public abstract class EntityMinecartAbstract extends Entity { diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch index e99ac6c669..ae4ead8e37 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch @@ -20,7 +20,7 @@ index f7a0a33e49cadf9b2bd43f118c106937760da762..50dec5cb5e924301842300e8fc80cb67 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5a06220f876c868ac2ddb4aeaad9f91f0804f2a5..0747b943491c6b7d9e7862307d041a5fb8072b6c 100644 +index ec885c22279b237974ef461285ba59e0033800d9..783e665cf519b3ba67e7be182d61eb99fac0d0b4 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch index 8b133a3e08..0ff970e670 100644 --- a/Spigot-Server-Patches/0032-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch @@ -25,7 +25,7 @@ index 50dec5cb5e924301842300e8fc80cb671b6b9173..f038d3f7dc7d1034a3ee9f2384a85642 + } } diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index abc9eea66fed45db54e7b2a26ca8f7b05ca40e20..19f7312ee31baebbbccc3126b28418e7b817d247 100644 +index 8e7b9f11ee8a9010084960fb41a41eeadc06780e..88d2fa33e4c9f90f2aa80b3afbf28edbdbeb03db 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -173,7 +173,7 @@ public class Explosion { @@ -123,7 +123,7 @@ index abc9eea66fed45db54e7b2a26ca8f7b05ca40e20..19f7312ee31baebbbccc3126b28418e7 + // Paper end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0a3eeda5d52215a222ed1919c09a38f7fd2ef8e5..02e60ff8da52742b0fd3d81a2ef62b098708347a 100644 +index 74760e36b4e14ae6bd6e65324e5282f6e1e8dd59..0d892aa828b75fddae89fe5133710af96719e408 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1206,6 +1206,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant this.e() && (double) blockposition.getX() < this.g() && (double) (blockposition.getZ() + 1) > this.f() && (double) blockposition.getZ() < this.h(); } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index d593899d3243d85bd1dafba4d2c603d6cfe32839..cbfb5538965201bcdcb96d75a9fc5be8bc1d39fd 100644 +index b398fcfb9f2bd61a6481bb35bebfb26f5d12e69a..fd50d0649edb0bbc71bb775059993cca0cb2c227 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -84,7 +84,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch index af06d42d75..cf2a46f494 100644 --- a/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 60ffbec4bb28f8e0661183f6e21d547878774387..011aa803cdce6c0179d786eebe4541357aeb09f0 100644 +index 98742de5952c6d09592bdbcb12ed8862712a63e7..a69eadd57a2ccb30eaa5f997feebf0cbb2300065 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -3092,9 +3092,10 @@ public abstract class EntityLiving extends Entity { +@@ -3093,9 +3093,10 @@ public abstract class EntityLiving extends Entity { this.b(this.activeItem, 16); // CraftBukkit start - fire PlayerItemConsumeEvent ItemStack itemstack; @@ -20,7 +20,7 @@ index 60ffbec4bb28f8e0661183f6e21d547878774387..011aa803cdce6c0179d786eebe454135 world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { -@@ -3108,6 +3109,13 @@ public abstract class EntityLiving extends Entity { +@@ -3109,6 +3110,13 @@ public abstract class EntityLiving extends Entity { } else { itemstack = this.activeItem.a(this.world, this); } @@ -34,7 +34,7 @@ index 60ffbec4bb28f8e0661183f6e21d547878774387..011aa803cdce6c0179d786eebe454135 // CraftBukkit end if (itemstack != this.activeItem) { -@@ -3115,6 +3123,11 @@ public abstract class EntityLiving extends Entity { +@@ -3116,6 +3124,11 @@ public abstract class EntityLiving extends Entity { } this.clearActiveItem(); diff --git a/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 32bf26c91d..3ce2e9fd65 100644 --- a/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 011aa803cdce6c0179d786eebe4541357aeb09f0..8f78b214414a1283d7fd97785f59946c1032619f 100644 +index a69eadd57a2ccb30eaa5f997feebf0cbb2300065..e9a67693f36345da1ef657a584f996928979188d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -603,7 +603,13 @@ public abstract class EntityLiving extends Entity { @@ -34,7 +34,7 @@ index 011aa803cdce6c0179d786eebe4541357aeb09f0..8f78b214414a1283d7fd97785f59946c // CraftBukkit start - Handle scaled health if (this instanceof EntityPlayer) { org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity(); -@@ -2932,7 +2942,7 @@ public abstract class EntityLiving extends Entity { +@@ -2933,7 +2943,7 @@ public abstract class EntityLiving extends Entity { } public void setAbsorptionHearts(float f) { diff --git a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch index 9596f8bc61..84b7086845 100644 --- a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fd881f2e262f5514392a484cf3e442173acb9be1..f74eaf5cfd0add930d71d89e9a5441f4115e5f6c 100644 +index 7876feb489a99286137c0608504d643c3319f1f2..268aca49b98ba02c25fde588240c4ddc19a5fe00 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -58,6 +58,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -32,7 +32,7 @@ index fd881f2e262f5514392a484cf3e442173acb9be1..f74eaf5cfd0add930d71d89e9a5441f4 public CraftEntity getBukkitEntity() { @@ -186,7 +201,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - this.x = Vec3D.a; + this.x = Vec3D.ORIGIN; this.am = 1.0F; this.an = 1.0F; - this.random = new Random(); diff --git a/Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch index ccdbde5293..512a318d65 100644 --- a/Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch @@ -22,7 +22,7 @@ index d8b9d87bca6eb95c2cea91e4d8466b9792582d52..92d1dffbf436a21943b4a6aa0fabf54f + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index cbfb5538965201bcdcb96d75a9fc5be8bc1d39fd..27336f26eec55e7d86b12986fff9ccb5874bad97 100644 +index fd50d0649edb0bbc71bb775059993cca0cb2c227..4f9e7df2f08c6db88fe8c337f20e620efca62ed8 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -475,7 +475,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index d6be51e05e..d1f7e566ad 100644 --- a/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -13,7 +13,7 @@ Replace all calls to the new place to the unnecessary forward. Optimize getType and getBlockData to manually inline and optimize the calls diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index 6b6ea0b33b10a9517b7af55fb8292fe245e3ca1e..e126f9d1d03de085f2d09d53fe8bcc1972aedeff 100644 +index f6a5ebd4c7ec045c8dd6841831f8fcc0b32d964e..63a9ce32fb8b98695e104f7d820cd9b1a8f230b1 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -20,6 +20,15 @@ public class BaseBlockPosition implements Comparable { @@ -192,7 +192,7 @@ index 065eeed71075bb8f4069cb172ea7fca54793ddc0..09da0cc8f02c504191dfec8be93e6cf6 @Override public Fluid getFluid(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1d0238566d8cef75c28389c5b7084019d25c8f72..b5a6e6152b020201de631a924c8fd077eb1b546a 100644 +index ca073af1c88721a856ad5a1878db24f3d94135e6..3b4ac43dbad865e1f99a20e4b8860797d060903f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -187,7 +187,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index bf1ede7be8..6c89c5e787 100644 --- a/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -32,7 +32,7 @@ index 48eb9c8a68d45c88c7a42e8e400446a374fb4fc9..2c8d49501664862559ed8974b4821bdd } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 02e60ff8da52742b0fd3d81a2ef62b098708347a..6b03ad1c75a7f62dd4fc6c5f355799ad981c40e6 100644 +index 0d892aa828b75fddae89fe5133710af96719e408..82ac7329aa0e9fada9a195afef65479865588393 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1172,6 +1172,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { return worldserver + " " + worldserver.getDimensionKey().a(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b5a6e6152b020201de631a924c8fd077eb1b546a..60bf9af6fe31a730861d82989cfb551ef3d3de59 100644 +index 3b4ac43dbad865e1f99a20e4b8860797d060903f..62af19816439beae85adf3c4de67971f3537d055 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -406,7 +406,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -66,7 +66,7 @@ index b5a6e6152b020201de631a924c8fd077eb1b546a..60bf9af6fe31a730861d82989cfb551e this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 27336f26eec55e7d86b12986fff9ccb5874bad97..7d1cfda9ea4944ff772003b8ecbbbd7554c79da1 100644 +index 4f9e7df2f08c6db88fe8c337f20e620efca62ed8..f833dca02871773feab2d296669fc3896c4bcb63 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -83,6 +83,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch index a61baa97d1..a25075cf07 100644 --- a/Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3c6765cc27950a3f9b97cba86c998ceede2e3725..a8c3530bc51784865f0119d1c01393de4eb6325e 100644 +index f833dca02871773feab2d296669fc3896c4bcb63..c5fdd3bf3e462833f33c94d68049400e68e7d283 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1097,7 +1097,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0075-EntityPathfindEvent.patch b/Spigot-Server-Patches/0075-EntityPathfindEvent.patch index 5cb90f5bed..6fae1a8a09 100644 --- a/Spigot-Server-Patches/0075-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0075-EntityPathfindEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java -index 3bb8363d08a017623e55ed733b86d0899ef7391d..0ed01f40edfdbeeeea9db55fcba7501ee597c1fb 100644 +index 95f916d5a08a7781278080c4f4abd4e152a945b5..da15615a19474d5db9bd46c3d772f467ec58b133 100644 --- a/src/main/java/net/minecraft/server/Navigation.java +++ b/src/main/java/net/minecraft/server/Navigation.java @@ -60,7 +60,7 @@ public class Navigation extends NavigationAbstract { @@ -17,9 +17,9 @@ index 3bb8363d08a017623e55ed733b86d0899ef7391d..0ed01f40edfdbeeeea9db55fcba7501e + return this.a(entity.getChunkCoordinates(), entity, i); // Paper - Forward target entity } - private int t() { + private int u() { diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 5003d16ab68e6b51bff07f66b10e93ce4a5cdb2d..8c51ab85ed4ef23f049fcbfac93e39ab739194cf 100644 +index 0c3b986c07d9b8dc2012bfa5b27388a67f080ff8..d043bf14d25fd030ec5fa079e3272df0c11cc5f2 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; @@ -31,7 +31,7 @@ index 5003d16ab68e6b51bff07f66b10e93ce4a5cdb2d..8c51ab85ed4ef23f049fcbfac93e39ab protected final World b; @Nullable protected PathEntity c; -@@ -94,16 +94,26 @@ public abstract class NavigationAbstract { +@@ -95,16 +95,26 @@ public abstract class NavigationAbstract { @Nullable public PathEntity a(BlockPosition blockposition, int i) { @@ -60,7 +60,7 @@ index 5003d16ab68e6b51bff07f66b10e93ce4a5cdb2d..8c51ab85ed4ef23f049fcbfac93e39ab if (set.isEmpty()) { return null; } else if (this.a.locY() < 0.0D) { -@@ -113,6 +123,23 @@ public abstract class NavigationAbstract { +@@ -114,6 +124,23 @@ public abstract class NavigationAbstract { } else if (this.c != null && !this.c.c() && set.contains(this.p)) { return this.c; } else { diff --git a/Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch index 52506cd159..15b0f46e49 100644 --- a/Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch +++ b/Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not load chunks for Pathfinding diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 8c51ab85ed4ef23f049fcbfac93e39ab739194cf..35de4e5be6bc0f3660ec795e41fa71d622662987 100644 +index d043bf14d25fd030ec5fa079e3272df0c11cc5f2..3ffa6b22dde89e26aea4b8e5ce0cd5db92dc9310 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -27,7 +27,7 @@ public abstract class NavigationAbstract { @@ -14,9 +14,9 @@ index 8c51ab85ed4ef23f049fcbfac93e39ab739194cf..35de4e5be6bc0f3660ec795e41fa71d6 private float r; - private final Pathfinder s; + private final Pathfinder s; public Pathfinder getPathfinder() { return this.s; } // Paper - OBFHELPER + private boolean t; public NavigationAbstract(EntityInsentient entityinsentient, World world) { - this.g = Vec3D.a; diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java index 8ba6dd459a863717c91dd59f3f2ee5e3a5ed8170..b31d1f73ce0f067e352868b53eab7557c34b17eb 100644 --- a/src/main/java/net/minecraft/server/Pathfinder.java diff --git a/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch index eb84c2e53c..6a19bd690a 100644 --- a/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 1b12577cabc52dbb870838599e1dd33ef8fa1948..7387d04174000974c1d6a0de33e04433a1d11e59 100644 +index 8e9f9605d575e97b17fde3b76e98d41b30a81c49..e68de1a715047ea83573ed963f1df50971bd85db 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -174,6 +174,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index 3a8cbf22d5..e577d3b11a 100644 --- a/Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 60bf9af6fe31a730861d82989cfb551ef3d3de59..04887987f33b10a91ab0580b69ff1ad1db376593 100644 +index 62af19816439beae85adf3c4de67971f3537d055..d55b688dcf41bf9082da311b143055d3a6683baf 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -466,6 +466,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch index 0e18aa045d..a9517cafc1 100644 --- a/Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List Massive hit to performance and it is completely unnecessary. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e6b62da5fc798db29aa1b31d00e5df2027637d0b..5b24446fbd242d31a3fe17c1c2f5611a5e15f509 100644 +index d55b688dcf41bf9082da311b143055d3a6683baf..0fbd0e4c6fe7a12807848470954aee859234fa5a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -39,7 +39,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -67,7 +67,7 @@ index e6b62da5fc798db29aa1b31d00e5df2027637d0b..5b24446fbd242d31a3fe17c1c2f5611a } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a8c3530bc51784865f0119d1c01393de4eb6325e..611b48d3d473e9c8738bd4545c9243658c03481e 100644 +index c5fdd3bf3e462833f33c94d68049400e68e7d283..7b41dddfb62e91b3a0102d98db07e4863be7a0bd 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1594,7 +1594,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch index c681b4bcc9..682162a87a 100644 --- a/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch @@ -19,7 +19,7 @@ index 7d726757d1083011a09c9f2ca37c33a81360e964..3d9a98936cfe933fd71fb82f07e1ba54 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6b03ad1c75a7f62dd4fc6c5f355799ad981c40e6..4f072874e4687cbfbe8ccd07c3f48b6ed6ea0b5e 100644 +index 82ac7329aa0e9fada9a195afef65479865588393..a0d59bf7d7c5582f6221b4b8868cfd18101f79b9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -432,6 +432,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 256, < 0, is tr Keep them consistent diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index aab9d9000285feeb5d5b6dbe1d296779ec5b67f2..6c78a7101dcef4eb967aa5d2e3c93b6e1e30a681 100644 +index 5e0ea872a03e603faf74ea58fd5541d9aeedb172..0b36f37a0f8accdcede06564f56f4ffa10dd9b74 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 GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch index fac5180ca0..5f071e2b0e 100644 --- a/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login Bring down to a saner Y level if super high, as this can cause the server to crash diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a4252ef2d5fcd66b47c87fc904f9dac5c4402724..5f8d7d71886de1e1dec23453d4e9a72000661cc5 100644 +index ed29b3cdbc0137f81d586207d4082a02d8ef73b5..40d35a7b04ae266214840da676a08f3967401fe2 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -205,6 +205,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index a618e5e66f..02eee7f509 100644 --- a/Spigot-Server-Patches/0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -30,7 +30,7 @@ index 6cb717a63f52d757b0b323408d2fc0c3d7db77da..e43aee3757b6765d898b50ebfff1a280 + } } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 969b0dca4acc959330c5f10a2c970c896d23ce63..6a03359a781874ed657157e3407897dde71f5b45 100644 +index f7cd0fadc8aadc5c3b1655ee70e81a2a3e848b8c..f5cd0c6e3b6d375fb227802e3620dab52f0f4de4 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -233,6 +233,13 @@ public class EntityFallingBlock extends Entity { diff --git a/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch index 8fd5579458..63dceffcb6 100644 --- a/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache user authenticator threads diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 61a4db3a8f2ea58aae2c84dc2d954de5cf8273ab..84c48018a070e877d1caf6c1d741cd5de7d9c631 100644 +index 40d35a7b04ae266214840da676a08f3967401fe2..9d0af9bcdc91996d09db9472fca6682368091efa 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -4,7 +4,9 @@ import com.google.common.collect.Lists; diff --git a/Spigot-Server-Patches/0120-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0120-Allow-Reloading-of-Command-Aliases.patch index 65cc804a36..da0008b54c 100644 --- a/Spigot-Server-Patches/0120-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0120-Allow-Reloading-of-Command-Aliases.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a215a6968ce378199e645b0786d6094ab11dd398..b233e48ce7cd173bad6f596f27ed920706e2fdfb 100644 +index e26299119f7c541a819b14fced45857119ffb072..96baf6edd6563e30ff2f34ddcfeeecdfadd0e5b9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2198,5 +2198,24 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0122-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0122-Don-t-let-fishinghooks-use-portals.patch index 56a9116bce..4d4e3cb4ef 100644 --- a/Spigot-Server-Patches/0122-Don-t-let-fishinghooks-use-portals.patch +++ b/Spigot-Server-Patches/0122-Don-t-let-fishinghooks-use-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't let fishinghooks use portals diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 9928ba1d181eef8735ccd4e282719b4ca3d62bea..bb1cb3a0a82ff3ef878aa591483b30eeab6fdc61 100644 +index cd095cee4f162e5c47c04a68c66a4eb743d95a3f..7dde9774106b7bc1dac46ad591279343b863a9cc 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -191,6 +191,11 @@ public class EntityFishingHook extends IProjectile { diff --git a/Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch index 0e8360a0f4..9ebf854493 100644 --- a/Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch +++ b/Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Pathfinding out of World Border This prevents Entities from trying to run outside of the World Border diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 35de4e5be6bc0f3660ec795e41fa71d622662987..85ffe76b80adfeaf15f057085de4b383e01b3b55 100644 +index 3ffa6b22dde89e26aea4b8e5ce0cd5db92dc9310..d39ce9c1816aaa33478dcd623056488ca21411f3 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java -@@ -126,7 +126,7 @@ public abstract class NavigationAbstract { +@@ -127,7 +127,7 @@ public abstract class NavigationAbstract { // Paper start - Pathfind event boolean copiedSet = false; for (BlockPosition possibleTarget : set) { diff --git a/Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch index f365a2fadd..25270dc8b6 100644 --- a/Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z Reduce method invocations for World.isLoaded(BlockPosition)Z diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a834930a72b5e289675c57f5d1a0594f258aa745..74f92b44550ed93dcae2366bb44e6a6d210925c6 100644 +index 1cc5321cc82c7561d805771a95408fb69ebaa800..9be2ab36eca6c268135e043904b7e0e8459b893b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -252,6 +252,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch index 18ba2d14b7..1b2e75be23 100644 --- a/Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index c2672f55f1da295c97bacc1313f84198573c0187..73e5bd74f6f9b1532d4abf8d8a0383c851daf35f 100644 +index ce9614e642d4e5e8cbea67a39061f99545fff942..254c7ad539edfbbd34464b80b523fa2134939ef9 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -45,6 +45,7 @@ public class EntityArmorStand extends EntityLiving { @@ -31,12 +31,12 @@ index c2672f55f1da295c97bacc1313f84198573c0187..73e5bd74f6f9b1532d4abf8d8a0383c8 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 253033878391f6cac97dcdbffe151ca82e830a9c..76176a3de05295a5493e0990116759505029dedc 100644 +index 7d07f95e669a9da9f2d6f663a75c907e6c829a98..bf2749fd724ac7b67fc0d5887aa307745c5f1835 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -228,4 +228,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { public boolean hasEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) { - return (getHandle().bv & (1 << CraftEquipmentSlot.getNMS(equipmentSlot).c() + lockType.ordinal() * 8)) != 0; + return (getHandle().disabledSlots & (1 << CraftEquipmentSlot.getNMS(equipmentSlot).getSlotFlag() + lockType.ordinal() * 8)) != 0; } + // Paper start + @Override diff --git a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch index 17d7ebd71a..d0d6a01720 100644 --- a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index aaa14c132e49341fac5ad4c83bc39b3858d9b2c0..93c0b38c89f9dc6316fe8bce5ad3b01f5d2e045d 100644 +index 9d0af9bcdc91996d09db9472fca6682368091efa..3d4ae2f7e6dbc10f38329d89027eea9c51e19c45 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1905,7 +1905,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0132-Firework-API-s.patch b/Spigot-Server-Patches/0132-Firework-API-s.patch index 1112b30ecc..0a50850f91 100644 --- a/Spigot-Server-Patches/0132-Firework-API-s.patch +++ b/Spigot-Server-Patches/0132-Firework-API-s.patch @@ -44,7 +44,7 @@ index b350825141e7a0d71a7362f1faf01c41d769a14f..36729e478329cdcd4af6132f30249633 @Override diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index a2549cf1253f472d58ce68e4414448561a7a5ba4..1592e94c78611a4b968bfb24daf68570e778fadd 100644 +index 9e17a002218ce82c0e1033f3487f878463970d17..14c0e7382292b3d39858d4d957df8016c301c712 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -183,6 +183,7 @@ public class ItemCrossbow extends ItemProjectileWeapon implements ItemVanishable diff --git a/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch index 4c96ecd669..230325c1e1 100644 --- a/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8198f7cc10132bb459fed759205cf4cbc31f4659..24997b1505db537bb19cb8fd966f7049dc9a0832 100644 +index 2c99bdfed76faedecf8121bd29b3fde4e883fb3a..62f1da9addcfb30ab23dce8c755dcc3e9951e202 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1946,6 +1946,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 4f5e7d2358..bb0be6b60e 100644 --- a/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -147,7 +147,7 @@ index 604bdc5ab98071db88ac3e93ebf11869cc60a308..deebd63e0297b245b82a620bc380c9f1 @Override diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index bb1cb3a0a82ff3ef878aa591483b30eeab6fdc61..5c2f6b0454f44c4b85cfd6d06eee584dfa0e0c6d 100644 +index 7dde9774106b7bc1dac46ad591279343b863a9cc..b6cace72ab2f3389408a5e528981fcff3b511180 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -452,7 +452,7 @@ public class EntityFishingHook extends IProjectile { @@ -173,7 +173,7 @@ index 13dad7a2db788bf900a48bab0a4ef0c4f4b5ddc3..83fa99b1cf784eb7f30b14f9f0743cba // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 06674ffcd4cb08a78b9a390d53ddb3934bf6c7d3..a1b5a02cb21b9c8257c4c3d9ad8025f8ebad9d46 100644 +index e6b1c3fc643599bf838c9616845d1eedd21c7725..f62653d5507a1f62e0521dc901283c2735b14e91 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1488,7 +1488,8 @@ public abstract class EntityLiving extends Entity { @@ -200,7 +200,7 @@ index 7a80b341ee7734cc289abdff8755834447cbef75..2d3ca8c424f2088027d51066d634c487 this.die(); diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index acd91ec21e2754b9969e203bd56de8a0f369c6c2..40a632434e43211710815944ad4aefa207f78780 100644 +index 736db44db5420a6676af797ab3b6b06aad7dde44..a3dcb72c600034886137c24b22e64c54980c33f3 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -499,7 +499,7 @@ public class EntityTurtle extends EntityAnimal { @@ -239,7 +239,7 @@ index c830b3c2145effc16314c6216be8af935416cb58..f1a509063c09e603140c74255a3fb901 } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 56f36e7eecab6a5bd68f25faec2896e39ed6a217..e413d14d6bf89b3eaf2ec06ba8634a83758d65b9 100644 +index 136bb85aace4efc34e1fe804bbccc78bf7495b41..ee59d76d31b8b8cfd39d612b1e6040891f2256f4 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -377,7 +377,7 @@ public class PlayerInteractManager { diff --git a/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch index 7565c83d5a..a957ac86f3 100644 --- a/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch @@ -27,7 +27,7 @@ index 255b4081314162cbe344b008158c6f4584795fb8..04ee0856a8c62e1afb438d4fddf40e60 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 24997b1505db537bb19cb8fd966f7049dc9a0832..8c60057b94910532a6fbe72af24b2bd2175a37ed 100644 +index 62f1da9addcfb30ab23dce8c755dcc3e9951e202..8933a974da42a06cb0b382e3436d4bb077da0c27 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -39,10 +39,10 @@ index 24997b1505db537bb19cb8fd966f7049dc9a0832..8c60057b94910532a6fbe72af24b2bd2 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a1b5a02cb21b9c8257c4c3d9ad8025f8ebad9d46..6ba023e9a57f24538f06f456a64f054082b7f3ac 100644 +index f62653d5507a1f62e0521dc901283c2735b14e91..60ee57139a86492c290b33808ca35300dcf96f54 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2790,8 +2790,11 @@ public abstract class EntityLiving extends Entity { +@@ -2791,8 +2791,11 @@ public abstract class EntityLiving extends Entity { } } diff --git a/Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch index 96803003d8..06acb4b698 100644 --- a/Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not let armorstands drown diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 73e5bd74f6f9b1532d4abf8d8a0383c851daf35f..9017b98799bde141002282a2709a3ad943999ccb 100644 +index 254c7ad539edfbbd34464b80b523fa2134939ef9..f2938b115aa34158e76da9f974f5746ed43630e1 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -830,5 +830,10 @@ public class EntityArmorStand extends EntityLiving { @@ -20,7 +20,7 @@ index 73e5bd74f6f9b1532d4abf8d8a0383c851daf35f..9017b98799bde141002282a2709a3ad9 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6ba023e9a57f24538f06f456a64f054082b7f3ac..37ebefa8b1e4344a50643bcc13c31083f911d043 100644 +index 60ee57139a86492c290b33808ca35300dcf96f54..0e79f18eaf11b9abab193135af07f4db2035a7eb 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -245,6 +245,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch index 83d07dda4f..f5d0cce439 100644 --- a/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b9e757b94d7c00b8bea23102417b2afbe7eccd7a..42365b2f183a08e799533c1e9757cca13729d8fe 100644 +index 9dd54bea5f9a7d1cb638100312855135f83bcaf9..3f1ab69ac09c0c5ab50a99961a705254f3749f18 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -91,6 +91,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrantorg.ow2.asm asm diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 44da68eb8e7c01800156e157cf7bc1c9003bef59..ea7f7f4a97ed5e1b878ec6ba2976bafbeb063df2 100644 +index 6e19b41f41137de8379eb6e0c8650441445e0f2e..822933c4a9e1cc8297ab70f62d50a8e2a0756c0a 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -131,8 +131,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/Spigot-Server-Patches/0168-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0168-Handle-plugin-prefixes-using-Log4J-configuration.patch index f748945c86..c948d80388 100644 --- a/Spigot-Server-Patches/0168-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0168-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/pom.xml b/pom.xml -index 6b2dbe62d2cf463b1d8b0124a8e73e3819424fe6..b49a13c5c1d56c8608a034b5fcb35165a8363d72 100644 +index ca6f4c4363189af1292898035cbb7a1e722d52e1..ef710ae3524032287aa2d2cad065b4b5973eb319 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ diff --git a/Spigot-Server-Patches/0169-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0169-Include-Log4J2-SLF4J-implementation.patch index 70f70b576c..a7358dccbb 100644 --- a/Spigot-Server-Patches/0169-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0169-Include-Log4J2-SLF4J-implementation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/pom.xml b/pom.xml -index b49a13c5c1d56c8608a034b5fcb35165a8363d72..8cf6fe72894af9c359940a87dfa9937e5a78e79b 100644 +index ef710ae3524032287aa2d2cad065b4b5973eb319..d4676c4711942e414890e7fb5f12e596337b62e2 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,12 @@ diff --git a/Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch index f835115b4b..07a7f68011 100644 --- a/Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 01130113c699047002640ccacf6210ca9a536ec1..77f95e26d1e5d3c505d412f863a85c7c3880ef0e 100644 +index f466b432bb1b976db23e3ad9622b6a4e66d9e28d..ddcaa435f87171bd3940089c30ba6eea73546e1f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1,5 +1,6 @@ @@ -15,7 +15,7 @@ index 01130113c699047002640ccacf6210ca9a536ec1..77f95e26d1e5d3c505d412f863a85c7c import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -@@ -2533,6 +2534,13 @@ public abstract class EntityLiving extends Entity { +@@ -2534,6 +2535,13 @@ public abstract class EntityLiving extends Entity { ItemStack itemstack1 = this.getEquipment(enumitemslot); if (!ItemStack.matches(itemstack1, itemstack)) { @@ -30,7 +30,7 @@ index 01130113c699047002640ccacf6210ca9a536ec1..77f95e26d1e5d3c505d412f863a85c7c map = Maps.newEnumMap(EnumItemSlot.class); } diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java -index 02a7ae6785b0539e4aa567fca377d727184fd019..60b235f16f5e762d635efa1578b715db445513a5 100644 +index 8862603d40ae6048345ef4cf34016c96fa12f76e..3ad9b3e69ef0ed8ad8eebcb323024670ce7599d1 100644 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java @@ -16,6 +16,7 @@ public enum EnumItemSlot { diff --git a/Spigot-Server-Patches/0178-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0178-Prevent-logins-from-being-processed-when-the-player-.patch index 108e3daa9f..ed56e3cf80 100644 --- a/Spigot-Server-Patches/0178-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/Spigot-Server-Patches/0178-Prevent-logins-from-being-processed-when-the-player-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index e7e2566a019441b9b95ae5f38c75134e451f227f..05583872f118346f6d7e1cd0f2304966ab65b5d9 100644 +index d96555b62e8c5963ac84e6c3b4b88c2411a2a42a..7400d85e21d8efd231b3a00f16765946bcc54e65 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -55,7 +55,11 @@ public class LoginListener implements PacketLoginInListener { diff --git a/Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch index 50565b5c0a..47a00b0a02 100644 --- a/Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch @@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 07db411fb01384bb9f43372f0e83eca05838c00d..aefdcbeb1a452871a5a7376b4c259b3284f10d75 100644 +index 83559b3a5b72729f6d75590cf322dd2507783bd1..1b15ccd6c05d1ed965c03cd50f7488e26741c2ed 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -71,7 +71,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch index 743163e5d5..533c61662f 100644 --- a/Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch @@ -56,7 +56,7 @@ index 6c4c804797fbbe73d179c6ed089427e64d0ebff4..338cf8c896a6fc869eb9c54d39ad5713 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 334728b1919bb10fb691015644ab46ee2df904ad..49e52d3ba93b2c68680f03aae244142e4532d68c 100644 +index 5de8463c94612edd11e02ac5d9757382c9598e7d..661bb54c27966c8050644b293d99dfe86e3c04ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -316,6 +316,20 @@ public class CraftBlock implements Block { diff --git a/Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch index 745bf3dae3..3d3f9c2481 100644 --- a/Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch @@ -72,7 +72,7 @@ index 2eb2ddcb4456437bb449a86c18fb24c8629870a7..4452a6e7f550f362145ce6533e6cc77c @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f7943251b81c06fcc7fc6b3eea80c521fd3f555d..bbca08b277d52e5fc32fc12d178d35be91a19dfe 100644 +index 6f9efe4e5d286fc73a1ecf82e39865715ff03a33..2cc7c1038dae2c521fee5cf471c22221db0a22fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1790,7 +1790,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0188-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0188-PlayerNaturallySpawnCreaturesEvent.patch index b71b6db1b7..da33e26eb1 100644 --- a/Spigot-Server-Patches/0188-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0188-PlayerNaturallySpawnCreaturesEvent.patch @@ -29,7 +29,7 @@ index 042031d2b7cb2f56d422145ffa7589fa46dd2e53..09cfd3ee900d0d1f523e6453163fdb80 Optional optional = ((Either) playerchunk.a().getNow(PlayerChunk.UNLOADED_CHUNK)).left(); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 044fecfda9dc9f7f503f39b26adab55c98b909c4..4be86db18a77af058a4227f6cb23abd2c5e41051 100644 +index 3d4ae2f7e6dbc10f38329d89027eea9c51e19c45..6a8327379e7520d31e5eb0a61893e6d9f23a6814 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0199-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0199-Implement-extended-PaperServerListPingEvent.patch index 377ddf3666..97e24d65b6 100644 --- a/Spigot-Server-Patches/0199-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0199-Implement-extended-PaperServerListPingEvent.patch @@ -177,7 +177,7 @@ index 0000000000000000000000000000000000000000..26ddf92f86fccc2b2562f7abf4788d1e + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b10dc2e552a43cd632aaee336203ddccc64d43b9..cf939069e5e77f79d598a91e77b42e04cecab671 100644 +index 08708a42737ce66794083116f55ea209dbf81dcf..aef859fbb975821dd952c9d339a43acac98c99ef 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2,6 +2,9 @@ package net.minecraft.server; diff --git a/Spigot-Server-Patches/0201-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0201-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 9dcba07ef6..fed062ea0e 100644 --- a/Spigot-Server-Patches/0201-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-Server-Patches/0201-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 05583872f118346f6d7e1cd0f2304966ab65b5d9..98fada9761dafe1784c7d579a01b6737d0e29ad5 100644 +index 7400d85e21d8efd231b3a00f16765946bcc54e65..230dcda34707b822790ace75957174f937821898 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -1,5 +1,7 @@ diff --git a/Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch index 88826cdf48..d6b11617af 100644 --- a/Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch @@ -19,7 +19,7 @@ index de781fce74e5300be508f25aac23f402f97a2874..49f051a1f47c73a66cc462b3eecf72c4 private final ItemCooldown bM; @Nullable diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 98fada9761dafe1784c7d579a01b6737d0e29ad5..f2ab2f7f81b95546294debaf1f0395b0c094ab44 100644 +index 230dcda34707b822790ace75957174f937821898..a3555dd251af5dd4b320428aadaffe7063ecd356 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -36,7 +36,7 @@ public class LoginListener implements PacketLoginInListener { diff --git a/Spigot-Server-Patches/0204-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0204-getPlayerUniqueId-API.patch index 2388a121da..358f3cd7f9 100644 --- a/Spigot-Server-Patches/0204-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0204-getPlayerUniqueId-API.patch @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bbca08b277d52e5fc32fc12d178d35be91a19dfe..7bc98d983bec7a0164070571bdd53f9ff739b23a 100644 +index 2cc7c1038dae2c521fee5cf471c22221db0a22fc..f23d8f5138b8fb86d4e1bb985501375d1d2864f8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1486,6 +1486,26 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0209-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0209-Add-method-to-open-already-placed-sign.patch index fca74dafab..34396b7db0 100644 --- a/Spigot-Server-Patches/0209-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-Server-Patches/0209-Add-method-to-open-already-placed-sign.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to open already placed sign diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 79149583bae9c286a62ff4ea678925109b357775..41f6bc1c2c9307c21757555536b035547986c1ab 100644 +index 65144fac2d36b038bbf729bb2abe7b5a907d61fd..a1c318aa6501d9d0bdd53dc1fb8a99b7a782b4ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -597,6 +597,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/Spigot-Server-Patches/0215-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0215-Expand-World.spawnParticle-API-and-add-Builder.patch index 397a7755a8..2a66f8c4c7 100644 --- a/Spigot-Server-Patches/0215-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0215-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6c78a7101dcef4eb967aa5d2e3c93b6e1e30a681..b62f908886478d09fb5831492d94a6427808ccf7 100644 +index 0b36f37a0f8accdcede06564f56f4ffa10dd9b74..530d55b569cbdf19df4ad39368dd20dc47bc7c97 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -57,7 +57,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch index 5afa8fca50..f8f02649bb 100644 --- a/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch @@ -19,10 +19,10 @@ index 69009246f12cc3acb0055af746e01097fa668e1b..35075ffac394153e28039809e0ed48fe + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 77f95e26d1e5d3c505d412f863a85c7c3880ef0e..5db1dc0692c3435d7cd1ed2d1c6796ddd6ec8cf0 100644 +index ddcaa435f87171bd3940089c30ba6eea73546e1f..7175a1146fbad4aa91f898a45415432bc27976da 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -3198,7 +3198,7 @@ public abstract class EntityLiving extends Entity { +@@ -3199,7 +3199,7 @@ public abstract class EntityLiving extends Entity { if (this.isHandRaised() && !this.activeItem.isEmpty()) { Item item = this.activeItem.getItem(); @@ -31,7 +31,7 @@ index 77f95e26d1e5d3c505d412f863a85c7c3880ef0e..5db1dc0692c3435d7cd1ed2d1c6796dd } else { return false; } -@@ -3454,4 +3454,15 @@ public abstract class EntityLiving extends Entity { +@@ -3455,4 +3455,15 @@ public abstract class EntityLiving extends Entity { public void broadcastItemBreak(EnumHand enumhand) { this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND); } @@ -48,7 +48,7 @@ index 77f95e26d1e5d3c505d412f863a85c7c3880ef0e..5db1dc0692c3435d7cd1ed2d1c6796dd + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 057d7e09d153edb2f1e5c83ada33fc2089d00cbf..caace62396e2612737ee5031bbbea699c5887fd2 100644 +index 3ee78da4090f36b34bd909e807715f7e9f31bcbf..a5bfed0ec551c3467fcccc7a99cfe0866cd5e644 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -699,5 +699,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0228-Improve-EntityShootBowEvent.patch b/Spigot-Server-Patches/0228-Improve-EntityShootBowEvent.patch index 7961820bf8..ff0ef0f9b1 100644 --- a/Spigot-Server-Patches/0228-Improve-EntityShootBowEvent.patch +++ b/Spigot-Server-Patches/0228-Improve-EntityShootBowEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Improve EntityShootBowEvent Adds missing call to Illagers and also adds Arrow ItemStack to skeltons diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java -index 2e03ddee685437061f123ede7c194b03d18076ee..73ac27913102f810a30bc704479b382f08a91132 100644 +index 435b755fdcfa64b4f8c4167e375d59e3ac8f23fb..ff8efca2616cb14d9e79e03e3d08781d2547b8eb 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java @@ -134,8 +134,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan @@ -28,7 +28,7 @@ index 2e03ddee685437061f123ede7c194b03d18076ee..73ac27913102f810a30bc704479b382f + // Paper end } - class a extends EntityIllagerWizard.c { + class a extends EntityIllagerWizard.PathfinderGoalCastSpell { diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java index ac013d55c5df502d8a8cdf18237a0ca956a444c4..513bb3087ea8e81d36dcc8f78e22b6c63b26f582 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java diff --git a/Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch index 62cd2e4434..3850128845 100644 --- a/Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch +++ b/Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch @@ -28,7 +28,7 @@ index 85d2f4bab52cef2822fb0431c9cf7b7becbd5ee7..0f7e162b342ac589dc357508a1dcd1ab // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 5e3ab1e430c81ebfa9214020ffb1b3c61344ec55..95f1a9d7d5f381a0e345a7973c402136cddabb36 100644 +index ab96dd1ac20998b6458ecf6f3fb6f5a2d5189eba..90c38aed8f546987e45b9fd3ae9aa11b2e1f2084 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1500,7 +1500,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -41,7 +41,7 @@ index 5e3ab1e430c81ebfa9214020ffb1b3c61344ec55..95f1a9d7d5f381a0e345a7973c402136 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 5db1dc0692c3435d7cd1ed2d1c6796ddd6ec8cf0..9ef4929554a98f4ea0f2265670817404ebb6029f 100644 +index 7175a1146fbad4aa91f898a45415432bc27976da..4c6c0b3b77b3cea9abf4a9e6dec4872201db7b7b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1240,7 +1240,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch index 11b0499d44..1e577b3305 100644 --- a/Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 9ef4929554a98f4ea0f2265670817404ebb6029f..4c48ff8fad90686da65097e4be6bcedca9761c3d 100644 +index 4c6c0b3b77b3cea9abf4a9e6dec4872201db7b7b..db84ddd62b627764ff5debc56095d37e81c94605 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -119,7 +119,7 @@ public abstract class EntityLiving extends Entity { @@ -18,7 +18,7 @@ index 9ef4929554a98f4ea0f2265670817404ebb6029f..4c48ff8fad90686da65097e4be6bcedc protected int bd; protected int be; private BlockPosition bx; -@@ -3181,10 +3181,12 @@ public abstract class EntityLiving extends Entity { +@@ -3182,10 +3182,12 @@ public abstract class EntityLiving extends Entity { return this.activeItem; } @@ -32,7 +32,7 @@ index 9ef4929554a98f4ea0f2265670817404ebb6029f..4c48ff8fad90686da65097e4be6bcedc return this.isHandRaised() ? this.activeItem.k() - this.dY() : 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index caace62396e2612737ee5031bbbea699c5887fd2..b54961ead096d05e147e32ab16c25c382a7756c6 100644 +index a5bfed0ec551c3467fcccc7a99cfe0866cd5e644..fb77846b236a7279e91ec4d9aab3eef3fe67cd4c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -709,5 +709,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch index f895a6cca6..63293f6e77 100644 --- a/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch @@ -34,7 +34,7 @@ index 0f7e162b342ac589dc357508a1dcd1ab02d1fe3e..cc20b73a993d021789840ed2ee7ba1fc this.activeContainer = this.defaultContainer; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4451fed44db1dc8b727b2bef3e0275bc9c829d6a..80962f5b1b00d5f5e07cdc1404d926d23da0159d 100644 +index 6a8327379e7520d31e5eb0a61893e6d9f23a6814..7ac4e006c76373d2aedb37adf22bbb3044f9e65b 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -412,7 +412,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -130,7 +130,7 @@ index ea7527b16571cef5c285e898f5a9fd0c063948fa..df8a92b082139c84afc32cf02541faa8 PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game"); cserver.getPluginManager().callEvent(playerQuitEvent); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index b62f908886478d09fb5831492d94a6427808ccf7..afefa310800972f2b5f36e6364b9126a13cca5c6 100644 +index 530d55b569cbdf19df4ad39368dd20dc47bc7c97..3d7950ea51a533477d3569d9768ca20a1b6d0822 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1008,7 +1008,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0240-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0240-Re-add-vanilla-entity-warnings-for-duplicates.patch index 81906906f3..93df98951c 100644 --- a/Spigot-Server-Patches/0240-Re-add-vanilla-entity-warnings-for-duplicates.patch +++ b/Spigot-Server-Patches/0240-Re-add-vanilla-entity-warnings-for-duplicates.patch @@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data... We should kind of know about these things you know. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index afefa310800972f2b5f36e6364b9126a13cca5c6..694962faed48b0d333ff95312a03f3a4189c0526 100644 +index 3d7950ea51a533477d3569d9768ca20a1b6d0822..81cdfe2351e62461171e5658290d80bb9b735d7a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -961,7 +961,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0242-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0242-Use-asynchronous-Log4j-2-loggers.patch index d756160de4..5788797ea7 100644 --- a/Spigot-Server-Patches/0242-Use-asynchronous-Log4j-2-loggers.patch +++ b/Spigot-Server-Patches/0242-Use-asynchronous-Log4j-2-loggers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/pom.xml b/pom.xml -index 8cf6fe72894af9c359940a87dfa9937e5a78e79b..2c80b0933b09854228e1bfc19a0ae6278f8c662e 100644 +index d4676c4711942e414890e7fb5f12e596337b62e2..b67b01c5af49b948fc0642a8caa6d5df5c1ed13e 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,13 @@ diff --git a/Spigot-Server-Patches/0243-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0243-add-more-information-to-Entity.toString.patch index 158de91502..6f76594847 100644 --- a/Spigot-Server-Patches/0243-add-more-information-to-Entity.toString.patch +++ b/Spigot-Server-Patches/0243-add-more-information-to-Entity.toString.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString() UUID, ticks lived, valid, dead diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5bf33cf31e5ef6313484b1d9f01f3879f608ab11..fe39746a0cde32c27f051896b1472b1fc1a200a9 100644 +index d6085ac3895321bf2ed1eea0f138b478e195c5bf..98ecbd1089aeb6d0dc92801d59d01b6e20a4a7c3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2423,7 +2423,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 5a74707493..825ca6b523 100644 --- a/Spigot-Server-Patches/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues Add -Ddebug.entities=true to your JVM flags to gain more information diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fe39746a0cde32c27f051896b1472b1fc1a200a9..e73a4c8dc3e15bc9897b7df86a87cd62f6908073 100644 +index 98ecbd1089aeb6d0dc92801d59d01b6e20a4a7c3..f33bc0b6c6d033d692bdd9c9cfb7d2197e9ca40c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -76,6 +76,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -40,7 +40,7 @@ index 8862bbd73b627e37709d46e6aeeee70c89cbd821..4bbcd00950405a4bf3ce391b557049a3 protected void g() { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index aefdcbeb1a452871a5a7376b4c259b3284f10d75..ae389806f62960816e6a8d0ab1bd8351c858546e 100644 +index 1b15ccd6c05d1ed965c03cd50f7488e26741c2ed..651791f27b796b081a52b8d8735a51e2f940e5df 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -68,6 +68,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -52,7 +52,7 @@ index aefdcbeb1a452871a5a7376b4c259b3284f10d75..ae389806f62960816e6a8d0ab1bd8351 public boolean captureBlockStates = false; public boolean captureTreeGeneration = false; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 694962faed48b0d333ff95312a03f3a4189c0526..1645d07da9323fa67829823cfdfbc08b60a59b27 100644 +index 81cdfe2351e62461171e5658290d80bb9b735d7a..04e57c81d0e58a801ad8e842c48fc6a143de70f2 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -84,6 +84,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0249-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0249-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index a06416f090..5fa52be8ab 100644 --- a/Spigot-Server-Patches/0249-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0249-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -19,7 +19,7 @@ index 6352051ab937d4d365e823a7112e76dc3ec34225..92ddf96f7db08a2b390ef3f49b0643f9 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ae389806f62960816e6a8d0ab1bd8351c858546e..7cacffaab40d47f6fdd53bb526e9146a33f2ebc4 100644 +index 651791f27b796b081a52b8d8735a51e2f940e5df..2f08328dabeb8e5c3734d4005d7086ec133f6f9d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -802,6 +802,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch index c92bf0c742..36b69792b8 100644 --- a/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java -index e7052aba9d63a296873044623808e003b3b453b7..916fb9b063f061d64da1c2ade1863a84313523cc 100644 +index 2d3e498d5c40e573aad88fd0fce7943e930956ba..8ba7718b61ad9f6c8537b44265818ecbcffbfb63 100644 --- a/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java @@ -453,6 +453,7 @@ public abstract class BlockBase { @@ -17,7 +17,7 @@ index e7052aba9d63a296873044623808e003b3b453b7..916fb9b063f061d64da1c2ade1863a84 return this.getBlock().c(this.p(), iblockaccess, blockposition, voxelshapecollision); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e73a4c8dc3e15bc9897b7df86a87cd62f6908073..06ff22f053652c7ba5b135ccb3080c12640cb9b6 100644 +index f33bc0b6c6d033d692bdd9c9cfb7d2197e9ca40c..6644115d6654a35cfb21b6c128430a3136a2281f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -96,7 +96,7 @@ index ed0f9c5d29c4f88b7beee4b0ecdd7a56de2d7a9e..881cea7c466f29ff4a89db28d104e850 if (operatorboolean.apply(false, false)) { throw (IllegalArgumentException) SystemUtils.c((Throwable) (new IllegalArgumentException())); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7cacffaab40d47f6fdd53bb526e9146a33f2ebc4..b7380f2ef554dc5f562340b7c59fd23cd1f271c1 100644 +index 2f08328dabeb8e5c3734d4005d7086ec133f6f9d..ee1e0459e5ae8b59c07f9a89c6eaf240e8cd244f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -178,6 +178,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0252-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0252-Add-some-Debug-to-Chunk-Entity-slices.patch index 26bba94917..8ac6ab855e 100644 --- a/Spigot-Server-Patches/0252-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0252-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -58,7 +58,7 @@ index bc249e399befa84cdf07cc58cd0072bb9cb5cced..3b3cae92513a85ba842d403c68f5a1fb return; } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 06ff22f053652c7ba5b135ccb3080c12640cb9b6..81bbe63090f233ae45d4b4d614b6c84d4101b173 100644 +index 6644115d6654a35cfb21b6c128430a3136a2281f..91deb3a39cc9a28d96bcac8fe3f4bb68e1fb2003 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0254-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0254-Prevent-Saving-Bad-entities-to-chunks.patch index c8ceaf66df..dd6780e4d3 100644 --- a/Spigot-Server-Patches/0254-Prevent-Saving-Bad-entities-to-chunks.patch +++ b/Spigot-Server-Patches/0254-Prevent-Saving-Bad-entities-to-chunks.patch @@ -80,7 +80,7 @@ index f30071fe5c1f33386829cc61d8c6976a39eff24f..1e28061dd83a4bf2daab38aee84ddba3 public static ChunkStatus.Type a(@Nullable NBTTagCompound nbttagcompound) { if (nbttagcompound != null) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 1645d07da9323fa67829823cfdfbc08b60a59b27..655feddd11b9793f43f4ec31b35b0cb15b0e5039 100644 +index 04e57c81d0e58a801ad8e842c48fc6a143de70f2..186a7b1435132f0795b74ee843f8a4c830aa9f43 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1040,6 +1040,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0256-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0256-Ignore-Dead-Entities-in-entityList-iteration.patch index b567fa2a24..2f34bfd2b7 100644 --- a/Spigot-Server-Patches/0256-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0256-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -51,7 +51,7 @@ index 3b3cae92513a85ba842d403c68f5a1fb8fde785d..5ee581d1634f44a98756c5d11def9c3d if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check list.add(t0); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 81bbe63090f233ae45d4b4d614b6c84d4101b173..b71fd1aed640f7281047f74f72884ed1f7a72d0e 100644 +index 91deb3a39cc9a28d96bcac8fe3f4bb68e1fb2003..015b74ba8792647d09e67152978bcb28c2e56b38 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -63,7 +63,7 @@ index 81bbe63090f233ae45d4b4d614b6c84d4101b173..b71fd1aed640f7281047f74f72884ed1 public float getBukkitYaw() { return this.yaw; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 655feddd11b9793f43f4ec31b35b0cb15b0e5039..71370c813710cebbfcdbc92f3dc8170727537322 100644 +index 186a7b1435132f0795b74ee843f8a4c830aa9f43..7ec836666f3468ce90db0da448f5b7afaad24c32 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1192,6 +1192,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0257-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0257-Implement-Expanded-ArmorStand-API.patch index 35ce86f43f..4819008cea 100644 --- a/Spigot-Server-Patches/0257-Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/0257-Implement-Expanded-ArmorStand-API.patch @@ -8,28 +8,19 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 9017b98799bde141002282a2709a3ad943999ccb..944c34a7011a0cfc447014e2931c8742f324fe59 100644 +index f2938b115aa34158e76da9f974f5746ed43630e1..c83f7a0baee28c93b035a4bee68eb26374d50a79 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java -@@ -38,7 +38,7 @@ public class EntityArmorStand extends EntityLiving { - private final NonNullList armorItems; - private boolean armorStandInvisible; - public long bi; -- public int bv; //PAIL private -> public, rename disabledSlots -+ public int bv; public final void setDisabledSlots(int i) { bv = i; } public final int getDisabledSlots() { return bv; } // Paper - OBFHELPER - public Vector3f headPose; - public Vector3f bodyPose; - public Vector3f leftArmPose; @@ -387,6 +387,7 @@ public class EntityArmorStand extends EntityLiving { return enumitemslot; } + public final boolean isSlotDisabled(EnumItemSlot slot) { return this.d(slot); } // Paper - OBFHELPER private boolean d(EnumItemSlot enumitemslot) { - return (this.bv & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms(); + return (this.disabledSlots & 1 << enumitemslot.getSlotFlag()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 76176a3de05295a5493e0990116759505029dedc..83838500017025005b89361c0926b15eed003761 100644 +index bf2749fd724ac7b67fc0d5887aa307745c5f1835..c0182f4c1478e6db9901bf0357ad08c3fd3699a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -32,11 +32,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { @@ -102,7 +93,7 @@ index 76176a3de05295a5493e0990116759505029dedc..83838500017025005b89361c0926b15e + net.minecraft.server.EnumItemSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot); + disabled += (1 << nmsSlot.c()) + (1 << (nmsSlot.c() + 8)) + (1 << (nmsSlot.c() + 16)); + } -+ getHandle().setDisabledSlots(disabled); ++ getHandle().disabledSlots = disabled; + } + + @Override diff --git a/Spigot-Server-Patches/0260-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0260-Break-up-and-make-tab-spam-limits-configurable.patch index 586ab42b8c..9e464d9ffe 100644 --- a/Spigot-Server-Patches/0260-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/Spigot-Server-Patches/0260-Break-up-and-make-tab-spam-limits-configurable.patch @@ -45,7 +45,7 @@ index c8a7d8092a2849b62a8d83d7970756fd76100025..2e5c71d6b7d120a308076d95a3d5b73c + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9a09d8068650916e1a0365599436d8dc3df723d4..5e11568d662313ee9844dc26b069185f796111b4 100644 +index 0512f3a2df406cc18083883e2689945067dabb71..754d4eead6960fda7b45a6466f9b4c18c7e89210 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -77,6 +77,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch index 2b7d314433..d93bdb068c 100644 --- a/Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch @@ -73,7 +73,7 @@ index 48958308a89cbe39e1b4dddcdd8d1d0b5ece6339..120bf8436fd82294c339add2e7bff1cd int i = blockposition.getX(); int j = blockposition.getY(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b7380f2ef554dc5f562340b7c59fd23cd1f271c1..8bb5f35dd211ef0267f55678bb568a7d3b9980ec 100644 +index ee1e0459e5ae8b59c07f9a89c6eaf240e8cd244f..5ae5caf23e9614bb506c8aa0d511e73c54abf903 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -218,6 +218,17 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -95,7 +95,7 @@ index b7380f2ef554dc5f562340b7c59fd23cd1f271c1..8bb5f35dd211ef0267f55678bb568a7d public boolean s_() { return this.isClientSide; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 71370c813710cebbfcdbc92f3dc8170727537322..4bbbf2c868d90f4ef1752e886ff0e6db84e0695b 100644 +index 7ec836666f3468ce90db0da448f5b7afaad24c32..d6c86ce6a6a23ac8e889b0a9e7b8b7b8513ba5d1 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1530,15 +1530,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0264-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0264-Add-Early-Warning-Feature-to-WatchDog.patch index fc0c325694..2dcb36243d 100644 --- a/Spigot-Server-Patches/0264-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0264-Add-Early-Warning-Feature-to-WatchDog.patch @@ -36,7 +36,7 @@ index 2e5c71d6b7d120a308076d95a3d5b73c5aca8bc9..1b21911c3e4fd1d4a3305176bb8477c3 public static int tabSpamLimit = 500; private static void tabSpamLimiters() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index cf939069e5e77f79d598a91e77b42e04cecab671..64bf641e0c4e168526c56dd46a3dca7fb09a8d3f 100644 +index aef859fbb975821dd952c9d339a43acac98c99ef..f9608bf0eb4e3dfc573fe626e7da9fccf69dc783 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -897,6 +897,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant map = this.q(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 83838500017025005b89361c0926b15eed003761..4936266b1be1c0acd49fb8eabd7bc909b2f6de9e 100644 +index c0182f4c1478e6db9901bf0357ad08c3fd3699a9..47043374d2357a8fbc37e9ff1a55b3bf9aaeabcd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -313,5 +313,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { diff --git a/Spigot-Server-Patches/0274-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0274-Optimize-CraftBlockData-Creation.patch index 636c1dc210..a77155eac5 100644 --- a/Spigot-Server-Patches/0274-Optimize-CraftBlockData-Creation.patch +++ b/Spigot-Server-Patches/0274-Optimize-CraftBlockData-Creation.patch @@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData and cloning it when one is needed. diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java -index 916fb9b063f061d64da1c2ade1863a84313523cc..4b1f8ceee358ed7dc17ff09c230ad7ec65e8f194 100644 +index 8ba7718b61ad9f6c8537b44265818ecbcffbfb63..eeeffa989e7024dc345fafda822e0b29f928a759 100644 --- a/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java @@ -323,6 +323,14 @@ public abstract class BlockBase { diff --git a/Spigot-Server-Patches/0276-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0276-Add-PhantomPreSpawnEvent.patch index ac81226fe7..5b12817e5e 100644 --- a/Spigot-Server-Patches/0276-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-Server-Patches/0276-Add-PhantomPreSpawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 84edac9e18e4beab31c12e74e5e1ad51d3eae579..0605cb3e9873f92835e9f121b18c35e8eca5ccbb 100644 +index c5ac72e2d5ffdfe0e605a4f2b9003ac6125a1e2b..1afcf17a8ca4eb17125e2a9d066c5a15a3818417 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -125,6 +125,11 @@ public class EntityPhantom extends EntityFlying implements IMonster { diff --git a/Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch index 72bb8738ff..856ae8b2b4 100644 --- a/Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 14fb5f34c683ec93c57b5383aef339dcbbf9e19a..1971768fc5a7ebd8422474610d81d40fcef24cdc 100644 +index 3a6e5cb459fb9866cf2e377b803501152ab7ce69..f193c2778d0f04973546256d648692398b932dca 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -3473,6 +3473,23 @@ public abstract class EntityLiving extends Entity { +@@ -3474,6 +3474,23 @@ public abstract class EntityLiving extends Entity { this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND); } // Paper start @@ -33,7 +33,7 @@ index 14fb5f34c683ec93c57b5383aef339dcbbf9e19a..1971768fc5a7ebd8422474610d81d40f public int getShieldBlockingDelay() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index b54961ead096d05e147e32ab16c25c382a7756c6..52b503442e96814f17b0a95a201e4c2bd356cd60 100644 +index fb77846b236a7279e91ec4d9aab3eef3fe67cd4c..94be9707abefeddcc495d8c0cbc9ed9737d6a56a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -201,6 +201,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0282-Improve-death-events.patch b/Spigot-Server-Patches/0282-Improve-death-events.patch index 0d336cc38f..83339a410f 100644 --- a/Spigot-Server-Patches/0282-Improve-death-events.patch +++ b/Spigot-Server-Patches/0282-Improve-death-events.patch @@ -27,7 +27,7 @@ index 6281f7900afab3ef1c9ba3c034b91cbfa1900f50..7f3401d5d7878e4a0f407e92bf110dbe int i = this.f ? 300 : 100; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b71fd1aed640f7281047f74f72884ed1f7a72d0e..675ff9b2ce573439462f5554f470ffcb0a971107 100644 +index 015b74ba8792647d09e67152978bcb28c2e56b38..9a3be0671275720821d8707e7e083027b7503aa5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1450,6 +1450,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -47,7 +47,7 @@ index b71fd1aed640f7281047f74f72884ed1f7a72d0e..675ff9b2ce573439462f5554f470ffcb protected void l(double d0, double d1, double d2) { diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 4a4c2a7b117428137bed65ed66f207d693b90c4b..587e8e582dfe9c3127ca2b298c4e1db79c2d6c8e 100644 +index 3b01b560f29e5d2c765f28b53e79119503fcfbac..5c3d2bbf7b2ae22347d251c90c85388779c2cd44 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -703,7 +703,8 @@ public class EntityArmorStand extends EntityLiving { @@ -119,7 +119,7 @@ index 29d1b9bb4e481b6d6fb7185d9adf17f5ec07d4a1..c14d722e9b1ed61d2878ca752797871b public void saveData(NBTTagCompound nbttagcompound) { super.saveData(nbttagcompound); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 1971768fc5a7ebd8422474610d81d40fcef24cdc..e95091c10ca14ddc20b904e2759fb63504c177a0 100644 +index f193c2778d0f04973546256d648692398b932dca..c54641d984bdd04067f9dba66322b01b840904ed 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -96,7 +96,7 @@ public abstract class EntityLiving extends Entity { @@ -260,7 +260,7 @@ index 1971768fc5a7ebd8422474610d81d40fcef24cdc..e95091c10ca14ddc20b904e2759fb635 @Nullable protected SoundEffect getSoundDeath() { return SoundEffects.ENTITY_GENERIC_DEATH; -@@ -2083,10 +2114,12 @@ public abstract class EntityLiving extends Entity { +@@ -2084,10 +2115,12 @@ public abstract class EntityLiving extends Entity { } @@ -274,7 +274,7 @@ index 1971768fc5a7ebd8422474610d81d40fcef24cdc..e95091c10ca14ddc20b904e2759fb635 return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 80962f5b1b00d5f5e07cdc1404d926d23da0159d..e7340fd1acd711e07d466882debb7225559cc21a 100644 +index 7ac4e006c76373d2aedb37adf22bbb3044f9e65b..246de149254a6303b36ba1e2441499497c09bc5b 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -82,6 +82,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0284-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0284-Mob-Pathfinding-API.patch index 691fae81eb..a52dde881f 100644 --- a/Spigot-Server-Patches/0284-Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/0284-Mob-Pathfinding-API.patch @@ -153,10 +153,10 @@ index 0000000000000000000000000000000000000000..af1bac9680028130e99c5e7130f258c1 + } +} diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 85ffe76b80adfeaf15f057085de4b383e01b3b55..7645fc16c3393364389562899d460ea6670a070d 100644 +index d39ce9c1816aaa33478dcd623056488ca21411f3..81c88c6bf737945c6cbd659d2feaf3f763b7df73 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java -@@ -78,7 +78,7 @@ public abstract class NavigationAbstract { +@@ -79,7 +79,7 @@ public abstract class NavigationAbstract { } @Nullable @@ -165,7 +165,7 @@ index 85ffe76b80adfeaf15f057085de4b383e01b3b55..7645fc16c3393364389562899d460ea6 return this.a(new BlockPosition(d0, d1, d2), i); } -@@ -103,7 +103,7 @@ public abstract class NavigationAbstract { +@@ -104,7 +104,7 @@ public abstract class NavigationAbstract { } @Nullable @@ -174,7 +174,7 @@ index 85ffe76b80adfeaf15f057085de4b383e01b3b55..7645fc16c3393364389562899d460ea6 return this.a(ImmutableSet.of(entity.getChunkCoordinates()), entity, 16, true, i); // Paper } -@@ -168,6 +168,7 @@ public abstract class NavigationAbstract { +@@ -169,6 +169,7 @@ public abstract class NavigationAbstract { return pathentity != null && this.a(pathentity, d0); } @@ -182,7 +182,7 @@ index 85ffe76b80adfeaf15f057085de4b383e01b3b55..7645fc16c3393364389562899d460ea6 public boolean a(@Nullable PathEntity pathentity, double d0) { if (pathentity == null) { this.c = null; -@@ -195,7 +196,7 @@ public abstract class NavigationAbstract { +@@ -196,7 +197,7 @@ public abstract class NavigationAbstract { } } @@ -191,7 +191,7 @@ index 85ffe76b80adfeaf15f057085de4b383e01b3b55..7645fc16c3393364389562899d460ea6 public PathEntity k() { return this.c; } -@@ -311,6 +312,7 @@ public abstract class NavigationAbstract { +@@ -320,6 +321,7 @@ public abstract class NavigationAbstract { return !this.m(); } diff --git a/Spigot-Server-Patches/0297-Add-sun-related-API.patch b/Spigot-Server-Patches/0297-Add-sun-related-API.patch index 13c0f5bd91..a2979c1d60 100644 --- a/Spigot-Server-Patches/0297-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0297-Add-sun-related-API.patch @@ -5,7 +5,7 @@ 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 95f1a9d7d5f381a0e345a7973c402136cddabb36..f5203a0058974de7f1e3e9e291908ff37d54dbd0 100644 +index 90c38aed8f546987e45b9fd3ae9aa11b2e1f2084..033a6c50dff9e5e5706f9e7ab8b95ea7bc37d5dd 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1529,6 +1529,7 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/Spigot-Server-Patches/0298-Turtle-API.patch b/Spigot-Server-Patches/0298-Turtle-API.patch index 316fac7b98..36d5c793e6 100644 --- a/Spigot-Server-Patches/0298-Turtle-API.patch +++ b/Spigot-Server-Patches/0298-Turtle-API.patch @@ -5,7 +5,7 @@ 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 40a632434e43211710815944ad4aefa207f78780..1fd2a41050de39b47a0fe6e52f7a6727a8475757 100644 +index a3dcb72c600034886137c24b22e64c54980c33f3..2ce40da2a8e28e80b4cb2cb827f45ddd4601d93a 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -31,7 +31,7 @@ public class EntityTurtle extends EntityAnimal { diff --git a/Spigot-Server-Patches/0300-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0300-Call-player-spectator-target-events-and-improve-impl.patch index 1257b643e4..1ad1ce8be2 100644 --- a/Spigot-Server-Patches/0300-Call-player-spectator-target-events-and-improve-impl.patch +++ b/Spigot-Server-Patches/0300-Call-player-spectator-target-events-and-improve-impl.patch @@ -19,7 +19,7 @@ spectate the target entity. Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d6586e2c36f89328ba482230ae7d6a050966ed27..d1f716067e6c71f523c7561b9ef92f4296d1a726 100644 +index 246de149254a6303b36ba1e2441499497c09bc5b..868dcb4b43a7d82f9df58742da6d5cd7ca5fdcc7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1660,15 +1660,59 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -88,7 +88,7 @@ index d6586e2c36f89328ba482230ae7d6a050966ed27..d1f716067e6c71f523c7561b9ef92f42 @Override diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5e11568d662313ee9844dc26b069185f796111b4..be6668446a643c47a9dcb97e41b03a2bd512ab0f 100644 +index 754d4eead6960fda7b45a6466f9b4c18c7e89210..dbfaa37dae64b01c99f5a3144693298132cb7676 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1128,6 +1128,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0301-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0301-Add-Velocity-IP-Forwarding-Support.patch index 26be8a6f74..a02934ca23 100644 --- a/Spigot-Server-Patches/0301-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0301-Add-Velocity-IP-Forwarding-Support.patch @@ -276,7 +276,7 @@ index b52e8b72eaee87e227b7cc2fd66101550262cb7e..990cfea6c2339cd3cf688e4645de76dc public void a(PacketDataSerializer packetdataserializer) throws IOException { this.a = packetdataserializer.i(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 20bf7dbfb206bc74f1b12c1bbf206ab5ce1ad3f4..b430aca723a1e15707bb80e70fdd5e46a01c0eaa 100644 +index edd6a946b8044a503f98a56dd1b6d65f7af1b0bc..1fe737be6b65554c49ed6c10780b339896a30a6a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -676,7 +676,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0305-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0305-Add-option-to-prevent-players-from-moving-into-unloa.patch index 95e4fa0e1c..84d2216013 100644 --- a/Spigot-Server-Patches/0305-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0305-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -20,7 +20,7 @@ index 098c99793c68ac916b52776f9a1cc2c6510c0057..15e1f9f65280043853544d3bf796f991 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index be6668446a643c47a9dcb97e41b03a2bd512ab0f..094d2e6ed281303cd72dc2db38bf6ff4ab83b013 100644 +index dbfaa37dae64b01c99f5a3144693298132cb7676..1141bfc55a8aed4f2a519ab753d1ba0c9cadb465 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -351,6 +351,13 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0306-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0306-Reset-players-airTicks-on-respawn.patch index 1416f62c9e..f0fe97e02f 100644 --- a/Spigot-Server-Patches/0306-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0306-Reset-players-airTicks-on-respawn.patch @@ -5,7 +5,7 @@ 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 675ff9b2ce573439462f5554f470ffcb0a971107..6f0050bacfda342719ba93e40743983e07868e51 100644 +index 9a3be0671275720821d8707e7e083027b7503aa5..4c96d3db6d0e97def4c04a4ec45cdab9d040fbe3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2250,6 +2250,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index 675ff9b2ce573439462f5554f470ffcb0a971107..6f0050bacfda342719ba93e40743983e return 300; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index ea06a264564c5cf4fef7de79e5795af13094effd..777b2f7e77d2b59d5a439252daf9d317ab82a838 100644 +index 868dcb4b43a7d82f9df58742da6d5cd7ca5fdcc7..9717ae9ead12eae7ad258b1a9d8b63c21945d934 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1997,6 +1997,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0308-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/Spigot-Server-Patches/0308-Improve-Server-Thread-Pool-and-Thread-Priorities.patch index c0c580f305..85c5aa5642 100644 --- a/Spigot-Server-Patches/0308-Improve-Server-Thread-Pool-and-Thread-Priorities.patch +++ b/Spigot-Server-Patches/0308-Improve-Server-Thread-Pool-and-Thread-Priorities.patch @@ -12,7 +12,7 @@ server threads Allow usage of a single thread executor by not using ForkJoin so single core CPU's. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 64bf641e0c4e168526c56dd46a3dca7fb09a8d3f..d3349c2654537f0308800e5e464f0d3fb2b1261d 100644 +index f9608bf0eb4e3dfc573fe626e7da9fccf69dc783..e08f913403c3cf3e6efec6c6409f046600c9eb7f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant, PlayerChunk.Failure>> completablefuture = this.a(chunkcoordintpair, 1, (i) -> { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index d9e87ef45970cefa8e9cd49b257b344c316c4dd2..01b72f5555fb8d9ce95deecf77301ed84e6049db 100644 +index 056ae03e9bf560ef2a8893a93e29e9a74f95b198..21c45b45f9784f94fc4c7432e2c77a9cd3ae4f9d 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -4,6 +4,8 @@ import com.google.common.annotations.VisibleForTesting; diff --git a/Spigot-Server-Patches/0357-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0357-Configurable-Keep-Spawn-Loaded-range-per-world.patch index db808b5d32..8726ed0f5e 100644 --- a/Spigot-Server-Patches/0357-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0357-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -21,7 +21,7 @@ index 21910dfd1a533e923a8a73e92fea25685a07b445..44811683cfe47adbdce6c8bd627bdbeb + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f4c1804fc956b2415d80e7704c1dd20c4a4b8264..e6e4e8c07b0283bdf45c8dac3cc47336a7430ca3 100644 +index 3b8e9cf112b4656e9dc4d127e8f7568e65d7d6e8..a68adf340c4e0210bd9c3c75acb3d503775870ec 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -605,6 +605,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c7989ab2ad8e160cdbbc8ce3f47ce38828242fb0..db34ac8eb46338114472874e892bd7f60dcbe589 100644 +index 56068aa96855136264779cb26661d02d98849b28..f3c12fdf059d1cc1be61f6bd98364d4404effea9 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -94,6 +94,79 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0374-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0374-Use-getChunkIfLoadedImmediately-in-places.patch index 3f886b3007..674c914595 100644 --- a/Spigot-Server-Patches/0374-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/Spigot-Server-Patches/0374-Use-getChunkIfLoadedImmediately-in-places.patch @@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk load in that case). diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f90ae950c72b50dadb8b83301baf5b24c71536e4..f1df55cfcaa3218d6e28df1448306a6f6e43ead6 100644 +index 53fe54354ee8a9e9c31bf97272d70c181e0776f1..66f86db4b04bf7059603b308cfd909f95ca7b94d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1010,7 +1010,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -21,7 +21,7 @@ index f90ae950c72b50dadb8b83301baf5b24c71536e4..f1df55cfcaa3218d6e28df1448306a6f return; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index dd956f5892bd79b5c614f3a85611e1238e679aed..6e2e5d7636c25c8fbb37cc96aac83f8b37828c1f 100644 +index 79d3f19eb8acbed35a4eb11157d548d79e6ea5a6..88c4faf64a577cc38fb0e80bee7ae7f24cbe445f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -104,6 +104,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -65,7 +65,7 @@ index dd956f5892bd79b5c614f3a85611e1238e679aed..6e2e5d7636c25c8fbb37cc96aac83f8b if (chunk != null) { chunk.a(oclass, axisalignedbb, list, predicate); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 45a1a6d64d92f9f191b7fc08fe3e56fd2786d03c..4a93341ebd6f6fabc8981b9769837dfe4304823b 100644 +index f3c12fdf059d1cc1be61f6bd98364d4404effea9..de468159b3fd3ea8498537a7755856d67cac5b7c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -91,7 +91,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0375-Reduce-sync-loads.patch b/Spigot-Server-Patches/0375-Reduce-sync-loads.patch index 8e3f7e3809..aadb4549df 100644 --- a/Spigot-Server-Patches/0375-Reduce-sync-loads.patch +++ b/Spigot-Server-Patches/0375-Reduce-sync-loads.patch @@ -298,7 +298,7 @@ index 032464901e02392df4966c68cce8d06f2bd6b6f8..55feb186e4f3f7985efdf7c4410ed423 this.serverThreadQueue.awaitTasks(completablefuture::isDone); com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6e2e5d7636c25c8fbb37cc96aac83f8b37828c1f..58c030976f36c20808fcec6d922f5a1d4727a372 100644 +index 88c4faf64a577cc38fb0e80bee7ae7f24cbe445f..8426bf5b16bbe7c9a8b1582e1dac0298898eb263 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1067,7 +1067,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -329,7 +329,7 @@ index 6e2e5d7636c25c8fbb37cc96aac83f8b37828c1f..58c030976f36c20808fcec6d922f5a1d if (chunk != null) { chunk.a(oclass, axisalignedbb, list, predicate); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 4a93341ebd6f6fabc8981b9769837dfe4304823b..fb81deb88d8a4b4616c5a4fd31977bd8eb78fa66 100644 +index de468159b3fd3ea8498537a7755856d67cac5b7c..08e422310d94f325734994f31411ce22b35cc4b4 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -166,6 +166,12 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0377-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0377-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch index c8332cf31f..60e38752c5 100644 --- a/Spigot-Server-Patches/0377-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch +++ b/Spigot-Server-Patches/0377-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch @@ -7,7 +7,7 @@ If the Bukkit generator already has a spawn, use it immediately instead of spending time generating one that we won't use diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4820030bbe1ad2f524011ffe5142abe6c7d28969..bdcbc2a05714c37fc034ddbfd0166efbeff1c4ac 100644 +index fa73b2c9c3b837e92826755f6cf1103eda24aba3..b47b9d0acef5de86ff31a5db9bb82dd41b586e0b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -509,12 +509,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant by; -@@ -3038,6 +3038,11 @@ public abstract class EntityLiving extends Entity { +@@ -3039,6 +3039,11 @@ public abstract class EntityLiving extends Entity { return ((Byte) this.datawatcher.get(EntityLiving.ag) & 2) > 0 ? EnumHand.OFF_HAND : EnumHand.MAIN_HAND; } @@ -31,7 +31,7 @@ index b36f4b5cd023df2e31feafe52850e2dee3660014..9eb7c8e4f58956d652b5b1f636353f0d private void t() { if (this.isHandRaised()) { if (ItemStack.d(this.b(this.getRaisedHand()), this.activeItem)) { -@@ -3047,7 +3052,12 @@ public abstract class EntityLiving extends Entity { +@@ -3048,7 +3053,12 @@ public abstract class EntityLiving extends Entity { this.b(this.activeItem, 5); } @@ -45,7 +45,7 @@ index b36f4b5cd023df2e31feafe52850e2dee3660014..9eb7c8e4f58956d652b5b1f636353f0d this.s(); } } else { -@@ -3097,7 +3107,10 @@ public abstract class EntityLiving extends Entity { +@@ -3098,7 +3108,10 @@ public abstract class EntityLiving extends Entity { if (!itemstack.isEmpty() && !this.isHandRaised() || forceUpdate) { // Paper use override flag this.activeItem = itemstack; @@ -57,7 +57,7 @@ index b36f4b5cd023df2e31feafe52850e2dee3660014..9eb7c8e4f58956d652b5b1f636353f0d if (!this.world.isClientSide) { this.c(1, true); this.c(2, enumhand == EnumHand.OFF_HAND); -@@ -3121,7 +3134,10 @@ public abstract class EntityLiving extends Entity { +@@ -3122,7 +3135,10 @@ public abstract class EntityLiving extends Entity { } } else if (!this.isHandRaised() && !this.activeItem.isEmpty()) { this.activeItem = ItemStack.b; @@ -69,7 +69,7 @@ index b36f4b5cd023df2e31feafe52850e2dee3660014..9eb7c8e4f58956d652b5b1f636353f0d } } -@@ -3249,7 +3265,10 @@ public abstract class EntityLiving extends Entity { +@@ -3250,7 +3266,10 @@ public abstract class EntityLiving extends Entity { } this.activeItem = ItemStack.b; diff --git a/Spigot-Server-Patches/0404-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0404-Add-effect-to-block-break-naturally.patch index 192c57ac7f..31d77bcfce 100644 --- a/Spigot-Server-Patches/0404-Add-effect-to-block-break-naturally.patch +++ b/Spigot-Server-Patches/0404-Add-effect-to-block-break-naturally.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add effect to block break naturally diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 8a1261ccb3b3eae7f00fdcad7f1220f459cdbfad..9905478f08aee2ea2beb6a1bcd86c2ab05718cac 100644 +index 41bd71a55626b933c948e5c7e7b8af534eb896c4..f787238575ed7ac9108a2fd9782af55056219767 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -632,6 +632,13 @@ public class CraftBlock implements Block { diff --git a/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch index 5ad15115bb..aa22e794a0 100644 --- a/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch +++ b/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch @@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms Adds villagers as separate config diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ca24d27cbc3100e989bf26c0f3f57cad3f97c11f..5263e219ab6c334e55fa4188e7f71594ec764e91 100644 +index 697b3a5dd6664b9c3ce6e945ee7b1fe290ccaef0..64f4768d1f6c19fec39c8e8ffc6ddc30affebdbf 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -163,7 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -40,15 +40,15 @@ index ca24d27cbc3100e989bf26c0f3f57cad3f97c11f..5263e219ab6c334e55fa4188e7f71594 if (enummovetype == EnumMoveType.PISTON) { + this.activatedTick = MinecraftServer.currentTick + 20; // Paper vec3d = this.b(vec3d); - if (vec3d.equals(Vec3D.a)) { + if (vec3d.equals(Vec3D.ORIGIN)) { return; @@ -587,6 +589,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - this.x = Vec3D.a; - this.setMot(Vec3D.a); + this.x = Vec3D.ORIGIN; + this.setMot(Vec3D.ORIGIN); } + // Paper start - ignore movement changes while inactive. + if (isTemporarilyActive && !(this instanceof EntityItem || this instanceof EntityMinecartAbstract) && vec3d == getMot() && enummovetype == EnumMoveType.SELF) { -+ setMot(Vec3D.a); ++ setMot(Vec3D.ORIGIN); + this.world.getMethodProfiler().exit(); + return; + } @@ -85,7 +85,7 @@ index 68f1a101174f4a2f7ab5556a5b733f75f3a7802f..4757e5a92c9cf04fa52d62bac6dae782 protected EntityCreature(EntityTypes entitytypes, World world) { super(entitytypes, world); diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index f5203a0058974de7f1e3e9e291908ff37d54dbd0..9cf496b5e59b228ed65dca7b6b2fea725fd361d9 100644 +index 033a6c50dff9e5e5706f9e7ab8b95ea7bc37d5dd..04eff01825bcf4cc38a749902065a5f54e73f1d7 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -47,7 +47,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -116,7 +116,7 @@ index f5203a0058974de7f1e3e9e291908ff37d54dbd0..9cf496b5e59b228ed65dca7b6b2fea72 if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) { EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle(); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 9eb7c8e4f58956d652b5b1f636353f0da98c2606..8ba93673ad5516b597cbe185bb8402fb5ab4e6e7 100644 +index 65a3123b9c623d0a19868ba3dd6456a98c8915ad..725c10f7bd8fab17044d3bbf4ac97d6a09a2dabe 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -98,7 +98,7 @@ public abstract class EntityLiving extends Entity { @@ -334,7 +334,7 @@ index 182cd7e9110408fff9909ef362d368d055a2b167..f3df10587e652d3a26d15deb09304b97 return this.c; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 930e41935e0ef1af37eafca005d4e492c3b72a6f..8afacfb8d5f4efd2ad6f95fbb7b0d62e68c51503 100644 +index 303d82bf4ba21b4a74805750650d07778b30d875..77c611a5366943031624b07e64d069f3f1d2e49a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -82,6 +82,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -351,7 +351,7 @@ index 930e41935e0ef1af37eafca005d4e492c3b72a6f..8afacfb8d5f4efd2ad6f95fbb7b0d62e public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a16e64735b7d4c9b65c9d4cb2cdf56cf3e478f5f..49409f15b35f5f42f1f34824b80e0828fd655b56 100644 +index c417b5fae91ab681c44101c8ac233437a0a82343..712c9f5708b4ddaccf961c99aeb57771c7039014 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -743,17 +743,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -422,7 +422,7 @@ index a16e64735b7d4c9b65c9d4cb2cdf56cf3e478f5f..49409f15b35f5f42f1f34824b80e0828 + if (isActive) { entity1.passengerTick(); + } else { -+ entity1.setMot(Vec3D.a); ++ entity1.setMot(Vec3D.ORIGIN); + entity1.inactiveTick(); + // copied from inside of if (isPassenger()) of passengerTick, but that ifPassenger is unnecessary + entity.syncPositionOf(entity1); diff --git a/Spigot-Server-Patches/0407-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0407-Fix-items-vanishing-through-end-portal.patch index f1eb94143d..bbc603c4b1 100644 --- a/Spigot-Server-Patches/0407-Fix-items-vanishing-through-end-portal.patch +++ b/Spigot-Server-Patches/0407-Fix-items-vanishing-through-end-portal.patch @@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the heightmap resolves the issue without having to load all spawn chunks. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5263e219ab6c334e55fa4188e7f71594ec764e91..8691592c64dc0a93e6de7fbd12ad53402919e6b5 100644 +index 64f4768d1f6c19fec39c8e8ffc6ddc30affebdbf..87eea4f68c66af8bd0be0062b58a0408d57ee148 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2621,6 +2621,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0409-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0409-Optimise-getChunkAt-calls-for-loaded-chunks.patch index b26f839020..c15353ee1b 100644 --- a/Spigot-Server-Patches/0409-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/Spigot-Server-Patches/0409-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -65,7 +65,7 @@ index dce9c62c0cf37a37994537b74dfdc2286c60fae2..f7055ee0f2d497502f6a8b03544a5595 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8afacfb8d5f4efd2ad6f95fbb7b0d62e68c51503..b68ffde49d9f49a2c5e47b524d1db720b9d7f4eb 100644 +index 77c611a5366943031624b07e64d069f3f1d2e49a..b95ff5ee16abeeef81690d9f47979bac603360d7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -286,6 +286,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0410-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0410-Allow-overriding-the-java-version-check.patch index f9518aee43..c18f900cf8 100644 --- a/Spigot-Server-Patches/0410-Allow-overriding-the-java-version-check.patch +++ b/Spigot-Server-Patches/0410-Allow-overriding-the-java-version-check.patch @@ -6,13 +6,13 @@ Subject: [PATCH] Allow overriding the java version check -DPaper.IgnoreJavaVersion=true diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 7f9aec88ff40c63fc204e7790fb5e5a719a18cf2..62ebe09f955e42ad75bde9f3de690c512473c87e 100644 +index ac60ed4396b67838ded7c775ca1115eba40d318b..0176b72d8a1b54e57a462272dac16d3416fa7cd8 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -175,7 +175,7 @@ public class Main { float javaVersion = Float.parseFloat(System.getProperty("java.class.version")); - if (javaVersion > 58.0) { - System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 14 is supported."); + if (javaVersion > 59.0) { + System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 15 is supported."); - return; + if (!Boolean.getBoolean("Paper.IgnoreJavaVersion")) return; // Paper } diff --git a/Spigot-Server-Patches/0412-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0412-Optimise-random-block-ticking.patch index d447d89a2d..384786d74e 100644 --- a/Spigot-Server-Patches/0412-Optimise-random-block-ticking.patch +++ b/Spigot-Server-Patches/0412-Optimise-random-block-ticking.patch @@ -230,7 +230,7 @@ index ed77117630d54b7ad81f633110c7d2a7c59288e9..95ef96286855624590b72d69514b0fc0 public interface a { diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 1fd2a41050de39b47a0fe6e52f7a6727a8475757..430f9d23a24f6d28af91719f8ca81ad1f83d00d0 100644 +index 2ce40da2a8e28e80b4cb2cb827f45ddd4601d93a..e025eef4761faa946c6bb39e3ab151ac6e3f4557 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -28,7 +28,7 @@ public class EntityTurtle extends EntityAnimal { @@ -243,7 +243,7 @@ index 1fd2a41050de39b47a0fe6e52f7a6727a8475757..430f9d23a24f6d28af91719f8ca81ad1 public BlockPosition getHomePos() { // Paper - public diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b68ffde49d9f49a2c5e47b524d1db720b9d7f4eb..6f0001afbc0f6cef00a9dda50e5d9b2254f64659 100644 +index b95ff5ee16abeeef81690d9f47979bac603360d7..b3b2ae829b246764a18d22868d441579aaa68f3f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1417,10 +1417,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -267,7 +267,7 @@ index b68ffde49d9f49a2c5e47b524d1db720b9d7f4eb..6f0001afbc0f6cef00a9dda50e5d9b22 public boolean isSavingDisabled() { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 026818ce2c69ffe0399cb1aa5391fa896720c36b..65e47279dcaba633bfbad324be04285422f809e9 100644 +index 712c9f5708b4ddaccf961c99aeb57771c7039014..0d958ef744f97951de8518703deb5d74ff63a221 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -557,7 +557,12 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0413-Entity-Jump-API.patch b/Spigot-Server-Patches/0413-Entity-Jump-API.patch index bd4c2c758b..cfdea18275 100644 --- a/Spigot-Server-Patches/0413-Entity-Jump-API.patch +++ b/Spigot-Server-Patches/0413-Entity-Jump-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity Jump API diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 8ba93673ad5516b597cbe185bb8402fb5ab4e6e7..1227dfbc0599b59fab6216a60f120f895b1f6f8c 100644 +index 725c10f7bd8fab17044d3bbf4ac97d6a09a2dabe..65ca413d5887b63a5f563494113b487e0eca1dcc 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2763,8 +2763,10 @@ public abstract class EntityLiving extends Entity { +@@ -2764,8 +2764,10 @@ public abstract class EntityLiving extends Entity { } else if (this.aP() && (!this.onGround || d7 > d8)) { this.c((Tag) TagsFluid.LAVA); } else if ((this.onGround || flag && d7 <= d8) && this.jumpTicks == 0) { @@ -34,7 +34,7 @@ index ed8c0073f0c938c2ee8ed0dad2afda21a115b67d..01cc3d94d3fe1f82c94abdfcc92b0d3b } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 4ce3295aba63d5b685641a6d308d91de9d7537fb..32819e4a8fcb1ac5d09ec0568fbb55da7b2d489d 100644 +index 2cbd983d517f8e7a8c4138859a4eba0d7e1685ee..e8f9d4845eadfa065981b9beb0165f431e89377d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -778,5 +778,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0414-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0414-Add-option-to-nerf-pigmen-from-nether-portals.patch index cd6696307d..995550ade6 100644 --- a/Spigot-Server-Patches/0414-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/Spigot-Server-Patches/0414-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -32,7 +32,7 @@ index a224a04ee1bb9705166913ef1c66aa031d87c270..4132cd4c6f13cfa1c0cda43daaa908ff } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index dc36365eccdee169a3077f643fc2a11e6f4958cc..116bb4e3a1386516c375a72429d464da1c9a553b 100644 +index 87eea4f68c66af8bd0be0062b58a0408d57ee148..28c3a8e5c09c3998e7e0d7ac9244dc8abcc6d69d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0415-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0415-Make-the-GUI-graph-fancier.patch index 15c868c6a9..e878ccedc8 100644 --- a/Spigot-Server-Patches/0415-Make-the-GUI-graph-fancier.patch +++ b/Spigot-Server-Patches/0415-Make-the-GUI-graph-fancier.patch @@ -398,7 +398,7 @@ index d4d5bc19e167a5271f8eb8d010f8a52b23b942df..859e31c63f94bdc7729c6d475990750b }); private final int[] b = new int[256]; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9290d6c84e764bf691d9222723d73209a3d9ae2e..c5dc14ee9b1721780ed83851c15c7bd3df83390d 100644 +index b5c27dda45d5403aeabaa837645a8bb656c09eb3..b92daeb1568f562a0910915ffbfadae9e25be0e2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -106,7 +106,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant entitytypes = entity.getEntityType(); int i = entitytypes.getChunkRange() * 16; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 8909fa8e17f4fab7d212804b0c393181441726d9..7dce9eef4075c3e4bdbf9e2eca77ae8752a76461 100644 +index 1b91a7930e3299aabe10aaa2d3477b17849f22ff..2ea5e2a95c4ce23e414e67860dbfa92e5f4a5568 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1411,7 +1411,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0429-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0429-Optimize-Collision-to-not-load-chunks.patch index cfcf7dac76..675d8c3bf1 100644 --- a/Spigot-Server-Patches/0429-Optimize-Collision-to-not-load-chunks.patch +++ b/Spigot-Server-Patches/0429-Optimize-Collision-to-not-load-chunks.patch @@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading massive amounts of surrounding chunks due to large AABB lookups. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index da1019d40b6b1dcfdae24be24980ea2b4f2a1aee..19749ae61a3b71f92e64f472bc1575bdcbd1c086 100644 +index 3467603fe784aad56acfb2879783aeb89cef1abc..36c5d5cf3d18dffcd1a87a7b88b99857a39cd9f9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -80,6 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0430-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0430-Don-t-tick-dead-players.patch index 45599578c8..5cd1bb3158 100644 --- a/Spigot-Server-Patches/0430-Don-t-tick-dead-players.patch +++ b/Spigot-Server-Patches/0430-Don-t-tick-dead-players.patch @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d2a5491116cbe81de97e7f7c87f4409e7ac451c6..62fef5579b689a6cfe0679764ea22803e0d35388 100644 +index 4bf0c25bc258f01fe05a48f3e879a1c5b7d1d8ee..dfef674d64a0d7e546e6360b134699074a7e39b0 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -473,7 +473,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0433-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0433-Increase-Light-Queue-Size.patch index ccded33fc0..a999d45683 100644 --- a/Spigot-Server-Patches/0433-Increase-Light-Queue-Size.patch +++ b/Spigot-Server-Patches/0433-Increase-Light-Queue-Size.patch @@ -28,7 +28,7 @@ index 6c80906d0cf3594a30aa201793a16a29ffeb1fcb..82ff9cc4ae84ca120f7b0c4bd14c55d1 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c5dc14ee9b1721780ed83851c15c7bd3df83390d..3c87b0c5a55caf589aabd508255e704368797d65 100644 +index b92daeb1568f562a0910915ffbfadae9e25be0e2..0675765b88a7312bad3bcf3160dd3f386d531d19 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -660,7 +660,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant bk = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p); protected static final DataWatcherObject bl = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4d117ed0de75672fe95341832ec032b665179b39..a5e3ba2ed7369473f61d0e5ceca58ac2b44ea3ee 100644 +index 87a74f390ed68fd3d3c51f39557669d7c2f75c0c..1bd77af8cf2152eee43684280db7e16e5bcad0f9 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -2,6 +2,7 @@ package net.minecraft.server; diff --git a/Spigot-Server-Patches/0456-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0456-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index 4c811913a2..5ebc630ce8 100644 --- a/Spigot-Server-Patches/0456-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/Spigot-Server-Patches/0456-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick delays anymore. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a5e3ba2ed7369473f61d0e5ceca58ac2b44ea3ee..7f9bd9a35e5164294a0cfedaf540544c70d0df09 100644 +index 1bd77af8cf2152eee43684280db7e16e5bcad0f9..9f5ac100ed011b8d5802aebfbc488bdecf9b0586 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -106,6 +106,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0457-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0457-Load-Chunks-for-Login-Asynchronously.patch index 26de7fedeb..e65420df6b 100644 --- a/Spigot-Server-Patches/0457-Load-Chunks-for-Login-Asynchronously.patch +++ b/Spigot-Server-Patches/0457-Load-Chunks-for-Login-Asynchronously.patch @@ -18,7 +18,7 @@ index 4c4e6e154e0db23662484d6aa03f1d762a48badb..893a835593af2ea95a50607c8c2f2cdb boolean flag1 = this.playerChunkMap.b(); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 19749ae61a3b71f92e64f472bc1575bdcbd1c086..a1da42cb757cec0114e1c4f435e342291c9143d8 100644 +index 36c5d5cf3d18dffcd1a87a7b88b99857a39cd9f9..5616234c2efee61316b8ad051f4cf5ce4e63448f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1281,7 +1281,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -31,7 +31,7 @@ index 19749ae61a3b71f92e64f472bc1575bdcbd1c086..a1da42cb757cec0114e1c4f435e34229 public void d(Vec3D vec3d) { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8b0037594df8d76c98c2285f5a63662aef4e3202..6db4d587c69af406d949c3d1ed73724a5bd2889d 100644 +index 9f5ac100ed011b8d5802aebfbc488bdecf9b0586..ebf532d6bc2faea310c373d1526db4e963e90438 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -44,6 +44,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0458-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0458-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index d61191f0b0..51f261ed3e 100644 --- a/Spigot-Server-Patches/0458-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/Spigot-Server-Patches/0458-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -7,7 +7,7 @@ The code following this has better support for null worlds to move them back to the world spawn. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a1da42cb757cec0114e1c4f435e342291c9143d8..24f8252bf449e27ab7d816288a43e9ad6b282e9a 100644 +index 5616234c2efee61316b8ad051f4cf5ce4e63448f..61633d5be6d16546b0780da7e726c9898c97ce10 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1714,9 +1714,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch index 35a9be1494..06aae0d9be 100644 --- a/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 1e6295d33be71c482da4a53dad4c3aa5ffce5710..b3e54f14aff15a3cb73de5a8e04de91336c1370e 100644 +index 2a6ae816ea4300a724a4baa0418337367a2b2e29..f9e7fd85254bfc8ed737e28060dc1014488c6b6e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1824,7 +1824,16 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0462-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0462-Add-phantom-creative-and-insomniac-controls.patch index e80eb0b0b9..4e104d9f70 100644 --- a/Spigot-Server-Patches/0462-Add-phantom-creative-and-insomniac-controls.patch +++ b/Spigot-Server-Patches/0462-Add-phantom-creative-and-insomniac-controls.patch @@ -21,7 +21,7 @@ index 82ff9cc4ae84ca120f7b0c4bd14c55d1a4280358..c6843f37f89f0df8a021f6f4b3ed048e + } } diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 0605cb3e9873f92835e9f121b18c35e8eca5ccbb..550f80bfdbc8048c23789a2a89ecc946163f0cdd 100644 +index 1afcf17a8ca4eb17125e2a9d066c5a15a3818417..3a70900c73e3a6c4f40cf74406534f4bfd3eb67b 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -225,6 +225,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { diff --git a/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch index 324dbe2acd..b77bf1e31b 100644 --- a/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the same item twice because the source was destroyed. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b1e064342aba168c3eb324e97b4b4239a50f19c3..e68102fe55ce6826cd66f8bf7ca42b65ec6932d8 100644 +index 61633d5be6d16546b0780da7e726c9898c97ce10..79ef156b669cd11b9c4f5e281a71bc066557c8f0 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1870,11 +1870,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -66,7 +66,7 @@ index b1e064342aba168c3eb324e97b4b4239a50f19c3..e68102fe55ce6826cd66f8bf7ca42b65 public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) { diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 587e8e582dfe9c3127ca2b298c4e1db79c2d6c8e..81df71b7e165b8702575176550a587cdb8744beb 100644 +index 5c3d2bbf7b2ae22347d251c90c85388779c2cd44..937fa3c69a5cba2fc2fa4506dc34ff8a37dae19c 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -559,7 +559,7 @@ public class EntityArmorStand extends EntityLiving { diff --git a/Spigot-Server-Patches/0464-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0464-Implement-Brigadier-Mojang-API.patch index 7579130c45..b044bee64a 100644 --- a/Spigot-Server-Patches/0464-Implement-Brigadier-Mojang-API.patch +++ b/Spigot-Server-Patches/0464-Implement-Brigadier-Mojang-API.patch @@ -30,7 +30,7 @@ index 4b1ea9bc39191e01f83577c7bad128cf1ab9612f..22d748008d24fd6ed7cd8c4914e2ceb3 event.getPlayer().getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java -index 27c16946b589a36a47b612c8b10b2955ba2715b1..7608b5021d66c39b8121f33829cd09d77c847277 100644 +index 54a1988341a4a6e80ab40624280b7c92532d5db6..7073d697a5d35b9b72ea05d5608438ac3e54c20d 100644 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java @@ -16,7 +16,7 @@ import java.util.function.BinaryOperator; @@ -69,7 +69,7 @@ index 27c16946b589a36a47b612c8b10b2955ba2715b1..7608b5021d66c39b8121f33829cd09d7 public boolean hasPermission(int i) { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index dbe1d5f2fa43715e658377a6765e0a53093ede76..e4a161f95c778815bcb240955d704b6bbc815565 100644 +index c7d88d9c190f0604189e6bfabc0250453b1a68c9..256ee3f8d8ef5a8e5b2a833b66c10e906de75b2c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -579,8 +579,12 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0466-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0466-Validate-PickItem-Packet-and-kick-for-invalid.patch index 49711d44d0..fe5bc6ed97 100644 --- a/Spigot-Server-Patches/0466-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/Spigot-Server-Patches/0466-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e4a161f95c778815bcb240955d704b6bbc815565..39090531e5cc77ef23c2a3b962b60586e28573ac 100644 +index 256ee3f8d8ef5a8e5b2a833b66c10e906de75b2c..6b7894a712abf435df028b4036a88b9acea148e6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -692,7 +692,14 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0467-Expose-game-version.patch b/Spigot-Server-Patches/0467-Expose-game-version.patch index 92cc02eaca..30dbb0d61d 100644 --- a/Spigot-Server-Patches/0467-Expose-game-version.patch +++ b/Spigot-Server-Patches/0467-Expose-game-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9941e5294f16d5353174dc584380140a5aa4a37a..2a437e27a8add0228b30fd9ba09de01df6f5c5e1 100644 +index 3d9c6ebe28f25270ac8a7a5ce26ea6e95640c722..3dfaa253257764c45db7971d78cc998008bb396a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -517,6 +517,13 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0469-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0469-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index 31d5fe311c..f1cb8a07da 100644 --- a/Spigot-Server-Patches/0469-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/Spigot-Server-Patches/0469-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index c8cbb853c7cbcc251da422e99c6c76ba72d6b733..bac292e6d8e6cdb239d8accd21eaa25022f5640f 100644 +index 5388a992eea0547d40a3f4fef95859473667dcd9..3ef864430bb56b3292709b78e948542a7ac6b882 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -20,6 +20,7 @@ public class Main { diff --git a/Spigot-Server-Patches/0470-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0470-Implement-Mob-Goal-API.patch index cee50a8952..8e02dc3f19 100644 --- a/Spigot-Server-Patches/0470-Implement-Mob-Goal-API.patch +++ b/Spigot-Server-Patches/0470-Implement-Mob-Goal-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/pom.xml b/pom.xml -index 2c80b0933b09854228e1bfc19a0ae6278f8c662e..594ab9afbd6249df8817eeb4eb50bffc986bfce1 100644 +index b67b01c5af49b948fc0642a8caa6d5df5c1ed13e..838f199b69d97fd7029837b4205c864325d113b1 100644 --- a/pom.xml +++ b/pom.xml @@ -133,6 +133,13 @@ @@ -873,7 +873,7 @@ index 22773eca7561d39cd838338efe6d40ab9421feba..2e56fcc32f914d2b5f4bb9d368f504f4 public PathfinderGoalWrapped(int i, PathfinderGoal pathfindergoal) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2a437e27a8add0228b30fd9ba09de01df6f5c5e1..82a4166032e234645059d03ee265418045e3935a 100644 +index 3dfaa253257764c45db7971d78cc998008bb396a..1eec6cbf792e6aa935078ad9ecfd89a8db8db1b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2310,5 +2310,11 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0471-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0471-Use-distance-map-to-optimise-entity-tracker.patch index c86c3e4b24..c99dc3ee61 100644 --- a/Spigot-Server-Patches/0471-Use-distance-map-to-optimise-entity-tracker.patch +++ b/Spigot-Server-Patches/0471-Use-distance-map-to-optimise-entity-tracker.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker Use the distance map to find candidate players for tracking. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index aabca4c8480c3960c123d6aee5ab50a2e9af551f..b7f4821476c184cebc6eeb91b5c6169314e3590a 100644 +index 79ef156b669cd11b9c4f5e281a71bc066557c8f0..c440b17620adf74e44d73a8a325e68544077f71f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -205,6 +205,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -32,7 +32,7 @@ index aabca4c8480c3960c123d6aee5ab50a2e9af551f..b7f4821476c184cebc6eeb91b5c61693 this.id = Entity.entityCount.incrementAndGet(); this.passengers = Lists.newArrayList(); diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index b8fa8a582c4e440990f7e9c426c40bb576a3af66..8fecf1172c50669604ac097c8e5d81f83087a063 100644 +index e9bc1d22825850a1f1ef3267428c19847d4c8ab8..4965d0fbc123071a2f2f44f559336f7ab9013293 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -72,6 +72,7 @@ public class EntityTrackerEntry { @@ -44,7 +44,7 @@ index b8fa8a582c4e440990f7e9c426c40bb576a3af66..8fecf1172c50669604ac097c8e5d81f8 List list = this.tracker.getPassengers(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2f83f308596e97f82833d639fe2a2ce1017c0574..1241d0253508f79867c5393751c0e6eb62f8b6fe 100644 +index 84694ddcd3d32a1b4d09791d8b206bccbdd8d9c3..4c21cd6ebfd78c0cbefc68ac446601050d41f6d6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1525,6 +1525,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 474bb8ee2548a90c74b458c9952ddf1e465a11ef..4f2e0a6fbc281c3ccb8f1bb655955d44d9afde32 100644 +index 98fddca0b906221d34dd7683d83920bbc8f0d70c..ac4c8192ed0ce9f57fa0bb2c2200dc59e320f641 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -117,6 +117,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -598,7 +598,7 @@ index 40f2984e5ba7627ef4ce87133bed5df51a68fd65..4c16da52f4402b21be2df3fdf5999427 while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8d1bc49e0fd7f0c3da1d6a8c29ddd4be9370e5a7..08ae4d4fc4e61120d0c68fa534d487140f4e21be 100644 +index fc77588e325e9c18092c877c5e845e60ffd29b4c..ce3a74d980e5551f4af5ae28f83f4c6e84bd96e7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -473,8 +473,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -662,7 +662,7 @@ index 5ef12e85d7374c137e2d7ff3e0571995070cc222..f35dda50fd9015a793708d214c648d75 private final Spigot spigot = new Spigot() { diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 119a9c1e400ada270d0d97bea4170a8238d9c17d..37e930e0cb05cdb19c1b0dbd870313a14402181b 100644 +index 9030284ba06dfdcc17c2710f428e84d70afea8d5..0b93635ba59df4eb4456a97c5e9b51ab5aeda53f 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -201,7 +201,7 @@ public class ActivationRange diff --git a/Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch index e81ae04223..da262f2213 100644 --- a/Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch +++ b/Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 32819e4a8fcb1ac5d09ec0568fbb55da7b2d489d..9577af4ffbf15e970f342976838315e023b4d83b 100644 +index e8f9d4845eadfa065981b9beb0165f431e89377d..56f0d799ca80d877543ae43ba3c53d62bbce8133 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -410,7 +410,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0481-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0481-Wait-for-Async-Tasks-during-shutdown.patch index b016051393..a05f63dbd7 100644 --- a/Spigot-Server-Patches/0481-Wait-for-Async-Tasks-during-shutdown.patch +++ b/Spigot-Server-Patches/0481-Wait-for-Async-Tasks-during-shutdown.patch @@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns if any are still running after that delay just as reload does. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1241d0253508f79867c5393751c0e6eb62f8b6fe..4f0b79be16dbc8b528095f8ebfe80d70ef6074ce 100644 +index 4c21cd6ebfd78c0cbefc68ac446601050d41f6d6..fa64622f78399b934b9246b03d747ad0997354a9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -771,6 +771,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant