From 82f6e6bb0e85aa20febcde13b14c81c230e2eddd Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 23 Nov 2021 16:04:41 +0100 Subject: [PATCH] More more more more more more work --- build-data/dev-imports.txt | 1 + ...ile-Entities-from-a-chunk-without-sn.patch | 0 .../Add-Ban-Methods-to-Player-Objects.patch | 0 .../Add-EntityKnockbackByEntityEvent.patch | 0 .../Add-EntityTeleportEndGatewayEvent.patch | 0 .../api/Add-TNTPrimeEvent.patch | 0 .../api/Add-World.getEntity-UUID-API.patch | 0 ...dd-an-asterisk-to-legacy-API-plugins.patch | 0 ...Add-getNearbyXXX-methods-to-Location.patch | 0 .../api/Add-hand-to-bucket-events.patch | 0 ...d-method-to-open-already-placed-sign.patch | 0 ...tional-world.getNearbyEntities-API-s.patch | 0 ...Allow-disabling-armour-stand-ticking.patch | 0 .../Allow-setting-the-vex-s-summoner.patch | 0 .../api/AnvilDamageEvent.patch | 0 ...lose-Plugin-Class-Loaders-on-Disable.patch | 0 .../api/EnderDragon-Events.patch | 0 .../api/Enderman.teleportRandomly.patch | 0 .../api/EndermanAttackPlayerEvent.patch | 0 .../api/EndermanEscapeEvent.patch | 0 .../api/Entity-getChunk-API.patch | 0 ...ent-consumeArrow-and-getArrowItem-AP.patch | 0 .../api/EntityTransformedEvent.patch | 0 .../api/Expand-ArmorStand-API.patch | 0 .../api/Expand-Explosions-API.patch | 0 .../Expand-Location-Manipulation-API.patch | 0 ...ld.spawnParticle-API-and-add-Builder.patch | 0 .../api/InventoryCloseEvent-Reason-API.patch | 0 ...PI-additions-for-quantity-flags-lore.patch | 0 .../api/ItemStack-getMaxItemUseDuration.patch | 0 ...ivingEntity-Hand-Raised-Item-Use-API.patch | 0 .../api/Location.isChunkLoaded-API.patch | 0 ...ion.toBlockLocation-toCenterLocation.patch | 0 .../api/Make-EnderDragon-extend-Mob.patch | 0 ...e-shield-blocking-delay-configurable.patch | 0 .../api/PlayerElytraBoostEvent.patch | 0 .../api/PlayerLaunchProjectileEvent.patch | 0 .../api/PlayerReadyArrowEvent.patch | 0 .../api/PotionEffect-clone-methods.patch | 0 ...vide-Chunk-Coordinates-as-a-Long-API.patch | 0 .../api/RangedEntity-API.patch | 0 ...deadlock-risk-in-firing-async-events.patch | 0 .../api/SkeletonHorse-Additions.patch | 0 .../api/WitchConsumePotionEvent.patch | 0 .../api/WitchReadyPotionEvent.patch | 0 .../api/WitchThrowPotionEvent.patch | 0 ...ile-Entities-from-a-chunk-without-sn.patch | 4 ++-- ...ftMagicNumbers.isSupportedApiVersion.patch | 0 ...ies-option-to-debug-dupe-uuid-issues.patch | 6 ++--- ...dd-Early-Warning-Feature-to-WatchDog.patch | 0 .../server/Add-TNTPrimeEvent.patch | 2 +- ...to-disable-ender-dragon-legacy-check.patch | 0 .../server/Add-hand-to-bucket-events.patch | 12 +++++----- ...d-method-to-open-already-placed-sign.patch | 0 ...Allow-disabling-armour-stand-ticking.patch | 0 ...Item-entities-with-World.spawnEntity.patch | 0 .../server/AnvilDamageEvent.patch | 0 ...e-if-stack-size-above-max-stack-size.patch | 0 .../Block-Enderpearl-Travel-Exploit.patch | 0 ...nd-make-tab-spam-limits-configurable.patch | 2 +- ...ServerListPingEvent-for-legacy-pings.patch | 0 ...le-Alternative-LootPool-Luck-Formula.patch | 0 ...urable-sprint-interruption-on-attack.patch | 9 +++++-- ...on-t-call-getItemMeta-on-hasItemMeta.patch | 0 .../server/EnderDragon-Events.patch | 0 .../server/Enderman.teleportRandomly.patch | 0 .../server/EndermanAttackPlayerEvent.patch | 0 .../server/EndermanEscapeEvent.patch | 16 ++++++------- .../server/Expand-Explosions-API.patch | 0 ...ld.spawnParticle-API-and-add-Builder.patch | 0 .../server/Fix-CraftEntity-hashCode.patch | 0 ...ient-rendering-skulls-from-same-user.patch | 24 +++++++++---------- ...-allowed-colored-signs-to-be-created.patch | 0 .../Flag-to-disable-the-channel-limit.patch | 0 ...plement-EntityKnockbackByEntityEvent.patch | 2 +- ...lement-EntityTeleportEndGatewayEvent.patch | 0 .../Implement-Expanded-ArmorStand-API.patch | 0 .../Implement-World.getEntity-UUID-API.patch | 0 .../Improve-BlockPosition-inlining.patch | 0 .../server/Improve-EntityShootBowEvent.patch | 0 .../Improved-Async-Task-Scheduler.patch | 0 .../InventoryCloseEvent-Reason-API.patch | 0 .../ItemStack-getMaxItemUseDuration.patch | 0 ...ivingEntity-Hand-Raised-Item-Use-API.patch | 0 ...6-Experience-should-save-as-Integers.patch | 0 .../Make-EnderDragon-implement-Mob.patch | 0 ...ke-legacy-ping-handler-more-reliable.patch | 0 ...e-shield-blocking-delay-configurable.patch | 0 ...ptimize-IntIdentityHashBiMiap-nextId.patch | 17 +++++++------ ...t-armor-stands-from-doing-entity-loo.patch | 6 ++--- .../server/PlayerElytraBoostEvent.patch | 0 .../server/PlayerLaunchProjectileEvent.patch | 2 +- .../server/PlayerReadyArrowEvent.patch | 0 ...sted-Ice-from-loading-holding-chunks.patch | 2 +- ...ils-when-failing-to-save-player-data.patch | 0 .../server/RangedEntity-API.patch | 0 ...nventory-when-cancelling-PlayerInter.patch | 0 .../server/SkeletonHorse-Additions.patch | 2 +- ...ed-flag-on-cancel-of-Explosion-Event.patch | 0 .../server/Upstream-config-migrations.patch | 0 ...r-to-keep-logging-IO-off-main-thread.patch | 4 ++-- .../Use-ConcurrentHashMap-in-JsonList.patch | 0 .../Use-a-Queue-for-Queueing-Commands.patch | 4 ++-- .../Vanished-players-don-t-have-rights.patch | 2 +- .../server/Vex-get-setSummoner-API.patch | 0 .../server/WitchConsumePotionEvent.patch | 0 .../server/WitchReadyPotionEvent.patch | 0 .../server/WitchThrowPotionEvent.patch | 0 ...-more-information-to-Entity.toString.patch | 2 +- ...-max-squid-spawn-height-configurable.patch | 13 +++++----- 110 files changed, 69 insertions(+), 63 deletions(-) rename patches/{unapplied => }/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch (100%) rename patches/{unapplied => }/api/Add-Ban-Methods-to-Player-Objects.patch (100%) rename patches/{unapplied => }/api/Add-EntityKnockbackByEntityEvent.patch (100%) rename patches/{unapplied => }/api/Add-EntityTeleportEndGatewayEvent.patch (100%) rename patches/{unapplied => }/api/Add-TNTPrimeEvent.patch (100%) rename patches/{unapplied => }/api/Add-World.getEntity-UUID-API.patch (100%) rename patches/{unapplied => }/api/Add-an-asterisk-to-legacy-API-plugins.patch (100%) rename patches/{unapplied => }/api/Add-getNearbyXXX-methods-to-Location.patch (100%) rename patches/{unapplied => }/api/Add-hand-to-bucket-events.patch (100%) rename patches/{unapplied => }/api/Add-method-to-open-already-placed-sign.patch (100%) rename patches/{unapplied => }/api/Additional-world.getNearbyEntities-API-s.patch (100%) rename patches/{unapplied => }/api/Allow-disabling-armour-stand-ticking.patch (100%) rename patches/{unapplied => }/api/Allow-setting-the-vex-s-summoner.patch (100%) rename patches/{unapplied => }/api/AnvilDamageEvent.patch (100%) rename patches/{unapplied => }/api/Close-Plugin-Class-Loaders-on-Disable.patch (100%) rename patches/{unapplied => }/api/EnderDragon-Events.patch (100%) rename patches/{unapplied => }/api/Enderman.teleportRandomly.patch (100%) rename patches/{unapplied => }/api/EndermanAttackPlayerEvent.patch (100%) rename patches/{unapplied => }/api/EndermanEscapeEvent.patch (100%) rename patches/{unapplied => }/api/Entity-getChunk-API.patch (100%) rename patches/{unapplied => }/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch (100%) rename patches/{unapplied => }/api/EntityTransformedEvent.patch (100%) rename patches/{unapplied => }/api/Expand-ArmorStand-API.patch (100%) rename patches/{unapplied => }/api/Expand-Explosions-API.patch (100%) rename patches/{unapplied => }/api/Expand-Location-Manipulation-API.patch (100%) rename patches/{unapplied => }/api/Expand-World.spawnParticle-API-and-add-Builder.patch (100%) rename patches/{unapplied => }/api/InventoryCloseEvent-Reason-API.patch (100%) rename patches/{unapplied => }/api/ItemStack-API-additions-for-quantity-flags-lore.patch (100%) rename patches/{unapplied => }/api/ItemStack-getMaxItemUseDuration.patch (100%) rename patches/{unapplied => }/api/LivingEntity-Hand-Raised-Item-Use-API.patch (100%) rename patches/{unapplied => }/api/Location.isChunkLoaded-API.patch (100%) rename patches/{unapplied => }/api/Location.toBlockLocation-toCenterLocation.patch (100%) rename patches/{unapplied => }/api/Make-EnderDragon-extend-Mob.patch (100%) rename patches/{unapplied => }/api/Make-shield-blocking-delay-configurable.patch (100%) rename patches/{unapplied => }/api/PlayerElytraBoostEvent.patch (100%) rename patches/{unapplied => }/api/PlayerLaunchProjectileEvent.patch (100%) rename patches/{unapplied => }/api/PlayerReadyArrowEvent.patch (100%) rename patches/{unapplied => }/api/PotionEffect-clone-methods.patch (100%) rename patches/{unapplied => }/api/Provide-Chunk-Coordinates-as-a-Long-API.patch (100%) rename patches/{unapplied => }/api/RangedEntity-API.patch (100%) rename patches/{unapplied => }/api/Remove-deadlock-risk-in-firing-async-events.patch (100%) rename patches/{unapplied => }/api/SkeletonHorse-Additions.patch (100%) rename patches/{unapplied => }/api/WitchConsumePotionEvent.patch (100%) rename patches/{unapplied => }/api/WitchReadyPotionEvent.patch (100%) rename patches/{unapplied => }/api/WitchThrowPotionEvent.patch (100%) rename patches/{unapplied => }/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch (96%) rename patches/{unapplied => }/server/Add-CraftMagicNumbers.isSupportedApiVersion.patch (100%) rename patches/{unapplied => }/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch (97%) rename patches/{unapplied => }/server/Add-Early-Warning-Feature-to-WatchDog.patch (100%) rename patches/{unapplied => }/server/Add-TNTPrimeEvent.patch (99%) rename patches/{unapplied => }/server/Add-config-to-disable-ender-dragon-legacy-check.patch (100%) rename patches/{unapplied => }/server/Add-hand-to-bucket-events.patch (93%) rename patches/{unapplied => }/server/Add-method-to-open-already-placed-sign.patch (100%) rename patches/{unapplied => }/server/Allow-disabling-armour-stand-ticking.patch (100%) rename patches/{unapplied => }/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch (100%) rename patches/{unapplied => }/server/AnvilDamageEvent.patch (100%) rename patches/{unapplied => }/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch (100%) rename patches/{unapplied => }/server/Block-Enderpearl-Travel-Exploit.patch (100%) rename patches/{unapplied => }/server/Break-up-and-make-tab-spam-limits-configurable.patch (98%) rename patches/{unapplied => }/server/Call-PaperServerListPingEvent-for-legacy-pings.patch (100%) rename patches/{unapplied => }/server/Configurable-Alternative-LootPool-Luck-Formula.patch (100%) rename patches/{unapplied => }/server/Configurable-sprint-interruption-on-attack.patch (85%) rename patches/{unapplied => }/server/Don-t-call-getItemMeta-on-hasItemMeta.patch (100%) rename patches/{unapplied => }/server/EnderDragon-Events.patch (100%) rename patches/{unapplied => }/server/Enderman.teleportRandomly.patch (100%) rename patches/{unapplied => }/server/EndermanAttackPlayerEvent.patch (100%) rename patches/{unapplied => }/server/EndermanEscapeEvent.patch (86%) rename patches/{unapplied => }/server/Expand-Explosions-API.patch (100%) rename patches/{unapplied => }/server/Expand-World.spawnParticle-API-and-add-Builder.patch (100%) rename patches/{unapplied => }/server/Fix-CraftEntity-hashCode.patch (100%) rename patches/{unapplied => }/server/Fix-client-rendering-skulls-from-same-user.patch (85%) rename patches/{unapplied => }/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch (100%) rename patches/{unapplied => }/server/Flag-to-disable-the-channel-limit.patch (100%) rename patches/{unapplied => }/server/Implement-EntityKnockbackByEntityEvent.patch (97%) rename patches/{unapplied => }/server/Implement-EntityTeleportEndGatewayEvent.patch (100%) rename patches/{unapplied => }/server/Implement-Expanded-ArmorStand-API.patch (100%) rename patches/{unapplied => }/server/Implement-World.getEntity-UUID-API.patch (100%) rename patches/{unapplied => }/server/Improve-BlockPosition-inlining.patch (100%) rename patches/{unapplied => }/server/Improve-EntityShootBowEvent.patch (100%) rename patches/{unapplied => }/server/Improved-Async-Task-Scheduler.patch (100%) rename patches/{unapplied => }/server/InventoryCloseEvent-Reason-API.patch (100%) rename patches/{unapplied => }/server/ItemStack-getMaxItemUseDuration.patch (100%) rename patches/{unapplied => }/server/LivingEntity-Hand-Raised-Item-Use-API.patch (100%) rename patches/{unapplied => }/server/MC-135506-Experience-should-save-as-Integers.patch (100%) rename patches/{unapplied => }/server/Make-EnderDragon-implement-Mob.patch (100%) rename patches/{unapplied => }/server/Make-legacy-ping-handler-more-reliable.patch (100%) rename patches/{unapplied => }/server/Make-shield-blocking-delay-configurable.patch (100%) rename patches/{unapplied => }/server/Optimize-IntIdentityHashBiMiap-nextId.patch (84%) rename patches/{unapplied => }/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch (86%) rename patches/{unapplied => }/server/PlayerElytraBoostEvent.patch (100%) rename patches/{unapplied => }/server/PlayerLaunchProjectileEvent.patch (99%) rename patches/{unapplied => }/server/PlayerReadyArrowEvent.patch (100%) rename patches/{unapplied => }/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch (89%) rename patches/{unapplied => }/server/Print-Error-details-when-failing-to-save-player-data.patch (100%) rename patches/{unapplied => }/server/RangedEntity-API.patch (100%) rename patches/{unapplied => }/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch (100%) rename patches/{unapplied => }/server/SkeletonHorse-Additions.patch (98%) rename patches/{unapplied => }/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch (100%) rename patches/{unapplied => }/server/Upstream-config-migrations.patch (100%) rename patches/{unapplied => }/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch (93%) rename patches/{unapplied => }/server/Use-ConcurrentHashMap-in-JsonList.patch (100%) rename patches/{unapplied => }/server/Use-a-Queue-for-Queueing-Commands.patch (97%) rename patches/{unapplied => }/server/Vanished-players-don-t-have-rights.patch (98%) rename patches/{unapplied => }/server/Vex-get-setSummoner-API.patch (100%) rename patches/{unapplied => }/server/WitchConsumePotionEvent.patch (100%) rename patches/{unapplied => }/server/WitchReadyPotionEvent.patch (100%) rename patches/{unapplied => }/server/WitchThrowPotionEvent.patch (100%) rename patches/{unapplied => }/server/add-more-information-to-Entity.toString.patch (97%) diff --git a/build-data/dev-imports.txt b/build-data/dev-imports.txt index 286aeeaaa9..bed1af5647 100644 --- a/build-data/dev-imports.txt +++ b/build-data/dev-imports.txt @@ -9,3 +9,4 @@ # minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter # minecraft net/minecraft/world/level/entity/LevelEntityGetter.java + diff --git a/patches/unapplied/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/unapplied/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/unapplied/api/Add-Ban-Methods-to-Player-Objects.patch b/patches/api/Add-Ban-Methods-to-Player-Objects.patch similarity index 100% rename from patches/unapplied/api/Add-Ban-Methods-to-Player-Objects.patch rename to patches/api/Add-Ban-Methods-to-Player-Objects.patch diff --git a/patches/unapplied/api/Add-EntityKnockbackByEntityEvent.patch b/patches/api/Add-EntityKnockbackByEntityEvent.patch similarity index 100% rename from patches/unapplied/api/Add-EntityKnockbackByEntityEvent.patch rename to patches/api/Add-EntityKnockbackByEntityEvent.patch diff --git a/patches/unapplied/api/Add-EntityTeleportEndGatewayEvent.patch b/patches/api/Add-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/unapplied/api/Add-EntityTeleportEndGatewayEvent.patch rename to patches/api/Add-EntityTeleportEndGatewayEvent.patch diff --git a/patches/unapplied/api/Add-TNTPrimeEvent.patch b/patches/api/Add-TNTPrimeEvent.patch similarity index 100% rename from patches/unapplied/api/Add-TNTPrimeEvent.patch rename to patches/api/Add-TNTPrimeEvent.patch diff --git a/patches/unapplied/api/Add-World.getEntity-UUID-API.patch b/patches/api/Add-World.getEntity-UUID-API.patch similarity index 100% rename from patches/unapplied/api/Add-World.getEntity-UUID-API.patch rename to patches/api/Add-World.getEntity-UUID-API.patch diff --git a/patches/unapplied/api/Add-an-asterisk-to-legacy-API-plugins.patch b/patches/api/Add-an-asterisk-to-legacy-API-plugins.patch similarity index 100% rename from patches/unapplied/api/Add-an-asterisk-to-legacy-API-plugins.patch rename to patches/api/Add-an-asterisk-to-legacy-API-plugins.patch diff --git a/patches/unapplied/api/Add-getNearbyXXX-methods-to-Location.patch b/patches/api/Add-getNearbyXXX-methods-to-Location.patch similarity index 100% rename from patches/unapplied/api/Add-getNearbyXXX-methods-to-Location.patch rename to patches/api/Add-getNearbyXXX-methods-to-Location.patch diff --git a/patches/unapplied/api/Add-hand-to-bucket-events.patch b/patches/api/Add-hand-to-bucket-events.patch similarity index 100% rename from patches/unapplied/api/Add-hand-to-bucket-events.patch rename to patches/api/Add-hand-to-bucket-events.patch diff --git a/patches/unapplied/api/Add-method-to-open-already-placed-sign.patch b/patches/api/Add-method-to-open-already-placed-sign.patch similarity index 100% rename from patches/unapplied/api/Add-method-to-open-already-placed-sign.patch rename to patches/api/Add-method-to-open-already-placed-sign.patch diff --git a/patches/unapplied/api/Additional-world.getNearbyEntities-API-s.patch b/patches/api/Additional-world.getNearbyEntities-API-s.patch similarity index 100% rename from patches/unapplied/api/Additional-world.getNearbyEntities-API-s.patch rename to patches/api/Additional-world.getNearbyEntities-API-s.patch diff --git a/patches/unapplied/api/Allow-disabling-armour-stand-ticking.patch b/patches/api/Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/unapplied/api/Allow-disabling-armour-stand-ticking.patch rename to patches/api/Allow-disabling-armour-stand-ticking.patch diff --git a/patches/unapplied/api/Allow-setting-the-vex-s-summoner.patch b/patches/api/Allow-setting-the-vex-s-summoner.patch similarity index 100% rename from patches/unapplied/api/Allow-setting-the-vex-s-summoner.patch rename to patches/api/Allow-setting-the-vex-s-summoner.patch diff --git a/patches/unapplied/api/AnvilDamageEvent.patch b/patches/api/AnvilDamageEvent.patch similarity index 100% rename from patches/unapplied/api/AnvilDamageEvent.patch rename to patches/api/AnvilDamageEvent.patch diff --git a/patches/unapplied/api/Close-Plugin-Class-Loaders-on-Disable.patch b/patches/api/Close-Plugin-Class-Loaders-on-Disable.patch similarity index 100% rename from patches/unapplied/api/Close-Plugin-Class-Loaders-on-Disable.patch rename to patches/api/Close-Plugin-Class-Loaders-on-Disable.patch diff --git a/patches/unapplied/api/EnderDragon-Events.patch b/patches/api/EnderDragon-Events.patch similarity index 100% rename from patches/unapplied/api/EnderDragon-Events.patch rename to patches/api/EnderDragon-Events.patch diff --git a/patches/unapplied/api/Enderman.teleportRandomly.patch b/patches/api/Enderman.teleportRandomly.patch similarity index 100% rename from patches/unapplied/api/Enderman.teleportRandomly.patch rename to patches/api/Enderman.teleportRandomly.patch diff --git a/patches/unapplied/api/EndermanAttackPlayerEvent.patch b/patches/api/EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/unapplied/api/EndermanAttackPlayerEvent.patch rename to patches/api/EndermanAttackPlayerEvent.patch diff --git a/patches/unapplied/api/EndermanEscapeEvent.patch b/patches/api/EndermanEscapeEvent.patch similarity index 100% rename from patches/unapplied/api/EndermanEscapeEvent.patch rename to patches/api/EndermanEscapeEvent.patch diff --git a/patches/unapplied/api/Entity-getChunk-API.patch b/patches/api/Entity-getChunk-API.patch similarity index 100% rename from patches/unapplied/api/Entity-getChunk-API.patch rename to patches/api/Entity-getChunk-API.patch diff --git a/patches/unapplied/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch similarity index 100% rename from patches/unapplied/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch rename to patches/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch diff --git a/patches/unapplied/api/EntityTransformedEvent.patch b/patches/api/EntityTransformedEvent.patch similarity index 100% rename from patches/unapplied/api/EntityTransformedEvent.patch rename to patches/api/EntityTransformedEvent.patch diff --git a/patches/unapplied/api/Expand-ArmorStand-API.patch b/patches/api/Expand-ArmorStand-API.patch similarity index 100% rename from patches/unapplied/api/Expand-ArmorStand-API.patch rename to patches/api/Expand-ArmorStand-API.patch diff --git a/patches/unapplied/api/Expand-Explosions-API.patch b/patches/api/Expand-Explosions-API.patch similarity index 100% rename from patches/unapplied/api/Expand-Explosions-API.patch rename to patches/api/Expand-Explosions-API.patch diff --git a/patches/unapplied/api/Expand-Location-Manipulation-API.patch b/patches/api/Expand-Location-Manipulation-API.patch similarity index 100% rename from patches/unapplied/api/Expand-Location-Manipulation-API.patch rename to patches/api/Expand-Location-Manipulation-API.patch diff --git a/patches/unapplied/api/Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/unapplied/api/Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/api/Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/unapplied/api/InventoryCloseEvent-Reason-API.patch b/patches/api/InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/unapplied/api/InventoryCloseEvent-Reason-API.patch rename to patches/api/InventoryCloseEvent-Reason-API.patch diff --git a/patches/unapplied/api/ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/ItemStack-API-additions-for-quantity-flags-lore.patch similarity index 100% rename from patches/unapplied/api/ItemStack-API-additions-for-quantity-flags-lore.patch rename to patches/api/ItemStack-API-additions-for-quantity-flags-lore.patch diff --git a/patches/unapplied/api/ItemStack-getMaxItemUseDuration.patch b/patches/api/ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/unapplied/api/ItemStack-getMaxItemUseDuration.patch rename to patches/api/ItemStack-getMaxItemUseDuration.patch diff --git a/patches/unapplied/api/LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/unapplied/api/LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/api/LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/unapplied/api/Location.isChunkLoaded-API.patch b/patches/api/Location.isChunkLoaded-API.patch similarity index 100% rename from patches/unapplied/api/Location.isChunkLoaded-API.patch rename to patches/api/Location.isChunkLoaded-API.patch diff --git a/patches/unapplied/api/Location.toBlockLocation-toCenterLocation.patch b/patches/api/Location.toBlockLocation-toCenterLocation.patch similarity index 100% rename from patches/unapplied/api/Location.toBlockLocation-toCenterLocation.patch rename to patches/api/Location.toBlockLocation-toCenterLocation.patch diff --git a/patches/unapplied/api/Make-EnderDragon-extend-Mob.patch b/patches/api/Make-EnderDragon-extend-Mob.patch similarity index 100% rename from patches/unapplied/api/Make-EnderDragon-extend-Mob.patch rename to patches/api/Make-EnderDragon-extend-Mob.patch diff --git a/patches/unapplied/api/Make-shield-blocking-delay-configurable.patch b/patches/api/Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/unapplied/api/Make-shield-blocking-delay-configurable.patch rename to patches/api/Make-shield-blocking-delay-configurable.patch diff --git a/patches/unapplied/api/PlayerElytraBoostEvent.patch b/patches/api/PlayerElytraBoostEvent.patch similarity index 100% rename from patches/unapplied/api/PlayerElytraBoostEvent.patch rename to patches/api/PlayerElytraBoostEvent.patch diff --git a/patches/unapplied/api/PlayerLaunchProjectileEvent.patch b/patches/api/PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/unapplied/api/PlayerLaunchProjectileEvent.patch rename to patches/api/PlayerLaunchProjectileEvent.patch diff --git a/patches/unapplied/api/PlayerReadyArrowEvent.patch b/patches/api/PlayerReadyArrowEvent.patch similarity index 100% rename from patches/unapplied/api/PlayerReadyArrowEvent.patch rename to patches/api/PlayerReadyArrowEvent.patch diff --git a/patches/unapplied/api/PotionEffect-clone-methods.patch b/patches/api/PotionEffect-clone-methods.patch similarity index 100% rename from patches/unapplied/api/PotionEffect-clone-methods.patch rename to patches/api/PotionEffect-clone-methods.patch diff --git a/patches/unapplied/api/Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 100% rename from patches/unapplied/api/Provide-Chunk-Coordinates-as-a-Long-API.patch rename to patches/api/Provide-Chunk-Coordinates-as-a-Long-API.patch diff --git a/patches/unapplied/api/RangedEntity-API.patch b/patches/api/RangedEntity-API.patch similarity index 100% rename from patches/unapplied/api/RangedEntity-API.patch rename to patches/api/RangedEntity-API.patch diff --git a/patches/unapplied/api/Remove-deadlock-risk-in-firing-async-events.patch b/patches/api/Remove-deadlock-risk-in-firing-async-events.patch similarity index 100% rename from patches/unapplied/api/Remove-deadlock-risk-in-firing-async-events.patch rename to patches/api/Remove-deadlock-risk-in-firing-async-events.patch diff --git a/patches/unapplied/api/SkeletonHorse-Additions.patch b/patches/api/SkeletonHorse-Additions.patch similarity index 100% rename from patches/unapplied/api/SkeletonHorse-Additions.patch rename to patches/api/SkeletonHorse-Additions.patch diff --git a/patches/unapplied/api/WitchConsumePotionEvent.patch b/patches/api/WitchConsumePotionEvent.patch similarity index 100% rename from patches/unapplied/api/WitchConsumePotionEvent.patch rename to patches/api/WitchConsumePotionEvent.patch diff --git a/patches/unapplied/api/WitchReadyPotionEvent.patch b/patches/api/WitchReadyPotionEvent.patch similarity index 100% rename from patches/unapplied/api/WitchReadyPotionEvent.patch rename to patches/api/WitchReadyPotionEvent.patch diff --git a/patches/unapplied/api/WitchThrowPotionEvent.patch b/patches/api/WitchThrowPotionEvent.patch similarity index 100% rename from patches/unapplied/api/WitchThrowPotionEvent.patch rename to patches/api/WitchThrowPotionEvent.patch diff --git a/patches/unapplied/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 96% rename from patches/unapplied/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index 3d19ac9839..4b52bc1cf9 100644 --- a/patches/unapplied/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/patches/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -8,9 +8,9 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/jav index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -@@ -0,0 +0,0 @@ package org.bukkit.craftbukkit; - import com.google.common.base.Preconditions; +@@ -0,0 +0,0 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicates; + import com.mojang.serialization.Codec; import java.lang.ref.WeakReference; +import java.util.ArrayList; import java.util.Arrays; diff --git a/patches/unapplied/server/Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 100% rename from patches/unapplied/server/Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to patches/server/Add-CraftMagicNumbers.isSupportedApiVersion.patch diff --git a/patches/unapplied/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 97% rename from patches/unapplied/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index f47886a530..02af593d4e 100644 --- a/patches/unapplied/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -44,7 +44,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 return this.chunkSource.getChunk(x, z, false); @@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { // CraftBukkit start - private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { + private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot + // Paper start + if (entity.valid) { @@ -68,14 +68,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + getAddToWorldStackTrace(entity).printStackTrace(); + } + // Paper end - // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit + // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit return false; } else { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper private CraftEntity bukkitEntity; diff --git a/patches/unapplied/server/Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/unapplied/server/Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/unapplied/server/Add-TNTPrimeEvent.patch b/patches/server/Add-TNTPrimeEvent.patch similarity index 99% rename from patches/unapplied/server/Add-TNTPrimeEvent.patch rename to patches/server/Add-TNTPrimeEvent.patch index cbf9df4310..7cf4e87a2a 100644 --- a/patches/unapplied/server/Add-TNTPrimeEvent.patch +++ b/patches/server/Add-TNTPrimeEvent.patch @@ -97,7 +97,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + if(!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.ITEM, player.getBukkitEntity()).callEvent()) + return InteractionResult.FAIL; + // Paper end - TntBlock.explode(world, pos, (LivingEntity) player); + TntBlock.explode(world, pos, player); world.setBlock(pos, Blocks.AIR.defaultBlockState(), 11); Item item = itemstack.getItem(); @@ -0,0 +0,0 @@ public class TntBlock extends Block { diff --git a/patches/unapplied/server/Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/unapplied/server/Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/unapplied/server/Add-hand-to-bucket-events.patch b/patches/server/Add-hand-to-bucket-events.patch similarity index 93% rename from patches/unapplied/server/Add-hand-to-bucket-events.patch rename to patches/server/Add-hand-to-bucket-events.patch index 3f97c69d1d..ce8b38ade9 100644 --- a/patches/unapplied/server/Add-hand-to-bucket-events.patch +++ b/patches/server/Add-hand-to-bucket-events.patch @@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 iblockdata = world.getBlockState(blockposition); BlockPos blockposition2 = iblockdata.getBlock() instanceof LiquidBlockContainer && this.content == Fluids.WATER ? blockposition : blockposition1; -- if (this.a(user, world, blockposition2, movingobjectpositionblock, movingobjectpositionblock.getDirection(), blockposition, itemstack)) { // CraftBukkit +- if (this.emptyContents(user, world, blockposition2, movingobjectpositionblock, movingobjectpositionblock.getDirection(), blockposition, itemstack)) { // CraftBukkit + if (this.emptyContents(user, world, blockposition2, movingobjectpositionblock, movingobjectpositionblock.getDirection(), blockposition, itemstack, hand)) { // CraftBukkit // Paper - add enumhand this.checkExtraContent(user, world, itemstack, blockposition2); if (user instanceof ServerPlayer) { @@ -56,12 +56,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @Override public boolean emptyContents(@Nullable Player player, Level world, BlockPos pos, @Nullable BlockHitResult hitResult) { -- return this.a(player, world, pos, hitResult, null, null, null); +- return this.emptyContents(player, world, pos, hitResult, null, null, null); + // Paper start - add enumHand + return emptyContents(player, world, pos, hitResult, null, null, null, null); } -- public boolean a(Player entityhuman, Level world, BlockPos blockposition, @Nullable BlockHitResult movingobjectpositionblock, Direction enumdirection, BlockPos clicked, ItemStack itemstack) { +- public boolean emptyContents(Player entityhuman, Level world, BlockPos blockposition, @Nullable BlockHitResult movingobjectpositionblock, Direction enumdirection, BlockPos clicked, ItemStack itemstack) { + public boolean emptyContents(Player entityhuman, Level world, BlockPos blockposition, @Nullable BlockHitResult movingobjectpositionblock, Direction enumdirection, BlockPos clicked, ItemStack itemstack, InteractionHand enumhand) { + // Paper end // CraftBukkit end @@ -80,9 +80,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } // CraftBukkit end if (!flag1) { -- return movingobjectpositionblock != null && this.a(entityhuman, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (BlockHitResult) null, enumdirection, clicked, itemstack); // CraftBukkit -+ return movingobjectpositionblock != null && this.emptyContents(entityhuman, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (BlockHitResult) null, enumdirection, clicked, itemstack, enumhand); // CraftBukkit // Paper - add enumhand - } else if (world.dimensionType().ultraWarm() && this.content.is((Tag) FluidTags.WATER)) { +- return movingobjectpositionblock != null && this.emptyContents(entityhuman, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (BlockHitResult) null, enumdirection, clicked, itemstack); // CraftBukkit ++ return movingobjectpositionblock != null && this.emptyContents(entityhuman, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (BlockHitResult) null, enumdirection, clicked, itemstack, enumhand); // CraftBukkit // Paper + } else if (world.dimensionType().ultraWarm() && this.content.is(FluidTags.WATER)) { int i = blockposition.getX(); int j = blockposition.getY(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/patches/unapplied/server/Add-method-to-open-already-placed-sign.patch b/patches/server/Add-method-to-open-already-placed-sign.patch similarity index 100% rename from patches/unapplied/server/Add-method-to-open-already-placed-sign.patch rename to patches/server/Add-method-to-open-already-placed-sign.patch diff --git a/patches/unapplied/server/Allow-disabling-armour-stand-ticking.patch b/patches/server/Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/unapplied/server/Allow-disabling-armour-stand-ticking.patch rename to patches/server/Allow-disabling-armour-stand-ticking.patch diff --git a/patches/unapplied/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/unapplied/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/unapplied/server/AnvilDamageEvent.patch b/patches/server/AnvilDamageEvent.patch similarity index 100% rename from patches/unapplied/server/AnvilDamageEvent.patch rename to patches/server/AnvilDamageEvent.patch diff --git a/patches/unapplied/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch similarity index 100% rename from patches/unapplied/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch rename to patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch diff --git a/patches/unapplied/server/Block-Enderpearl-Travel-Exploit.patch b/patches/server/Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/unapplied/server/Block-Enderpearl-Travel-Exploit.patch rename to patches/server/Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/unapplied/server/Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/Break-up-and-make-tab-spam-limits-configurable.patch similarity index 98% rename from patches/unapplied/server/Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/Break-up-and-make-tab-spam-limits-configurable.patch index 7be0c7ef64..e426462548 100644 --- a/patches/unapplied/server/Break-up-and-make-tab-spam-limits-configurable.patch +++ b/patches/server/Break-up-and-make-tab-spam-limits-configurable.patch @@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser private long keepAliveChallenge; // CraftBukkit start - multithreaded fields - private AtomicInteger chatSpamTickCount = new AtomicInteger(); + private final AtomicInteger chatSpamTickCount = new AtomicInteger(); + private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits // CraftBukkit end private int dropSpamTickCount; diff --git a/patches/unapplied/server/Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/unapplied/server/Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/server/Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/unapplied/server/Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/unapplied/server/Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/server/Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch b/patches/server/Configurable-sprint-interruption-on-attack.patch similarity index 85% rename from patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch rename to patches/server/Configurable-sprint-interruption-on-attack.patch index 630b7c9ed2..a4d8d3452d 100644 --- a/patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch +++ b/patches/server/Configurable-sprint-interruption-on-attack.patch @@ -10,10 +10,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +0,0 @@ public class PaperWorldConfig { - private void squidMaxSpawnHeight() { - squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D); + disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false); + log("Creeper lingering effect: " + disableCreeperLingeringEffect); } + ++ public double squidMaxSpawnHeight; ++ private void squidMaxSpawnHeight() { ++ squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D); ++ } ++ + public boolean disableSprintInterruptionOnAttack; + private void disableSprintInterruptionOnAttack() { + disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false); diff --git a/patches/unapplied/server/Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/unapplied/server/Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/server/Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/unapplied/server/EnderDragon-Events.patch b/patches/server/EnderDragon-Events.patch similarity index 100% rename from patches/unapplied/server/EnderDragon-Events.patch rename to patches/server/EnderDragon-Events.patch diff --git a/patches/unapplied/server/Enderman.teleportRandomly.patch b/patches/server/Enderman.teleportRandomly.patch similarity index 100% rename from patches/unapplied/server/Enderman.teleportRandomly.patch rename to patches/server/Enderman.teleportRandomly.patch diff --git a/patches/unapplied/server/EndermanAttackPlayerEvent.patch b/patches/server/EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/unapplied/server/EndermanAttackPlayerEvent.patch rename to patches/server/EndermanAttackPlayerEvent.patch diff --git a/patches/unapplied/server/EndermanEscapeEvent.patch b/patches/server/EndermanEscapeEvent.patch similarity index 86% rename from patches/unapplied/server/EndermanEscapeEvent.patch rename to patches/server/EndermanEscapeEvent.patch index e9c788650e..29645c87f2 100644 --- a/patches/unapplied/server/EndermanEscapeEvent.patch +++ b/patches/server/EndermanEscapeEvent.patch @@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -0,0 +0,0 @@ public class EnderMan extends Monster implements NeutralMob { - this.setGoalTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.UNKNOWN, true); + this.setTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.UNKNOWN, true); } + // Paper start @@ -22,8 +22,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end + @Override - public boolean setGoalTarget(LivingEntity entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason, boolean fireEvent) { - if (!super.setGoalTarget(entityliving, reason, fireEvent)) { + public boolean setTarget(LivingEntity entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason, boolean fireEvent) { + if (!super.setTarget(entityliving, reason, fireEvent)) { @@ -0,0 +0,0 @@ public class EnderMan extends Monster implements NeutralMob { if (this.level.isDay() && this.tickCount >= this.targetChangeTime + 600) { float f = this.getBrightness(); @@ -34,9 +34,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.teleport(); } @@ -0,0 +0,0 @@ public class EnderMan extends Monster implements NeutralMob { - if (this.isInvulnerableTo(source)) { - return false; - } else if (source instanceof IndirectEntityDamageSource) { + flag = false; + } + + if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start for (int i = 0; i < 64; ++i) { if (this.teleport()) { @@ -45,9 +45,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } + } // Paper end - return false; + return flag; } else { - boolean flag = super.hurt(source, amount); + boolean flag1 = super.hurt(source, amount); - if (!this.level.isClientSide() && !(source.getEntity() instanceof LivingEntity) && this.random.nextInt(10) != 0) { + if (!this.level.isClientSide() && !(source.getEntity() instanceof LivingEntity) && this.random.nextInt(10) != 0 && this.tryEscape(source == DamageSource.DROWN ? com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.DROWN : com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper - use to be critical hits as else, but mojang removed critical hits in 1.16.2 due to MC-185684 diff --git a/patches/unapplied/server/Expand-Explosions-API.patch b/patches/server/Expand-Explosions-API.patch similarity index 100% rename from patches/unapplied/server/Expand-Explosions-API.patch rename to patches/server/Expand-Explosions-API.patch diff --git a/patches/unapplied/server/Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/unapplied/server/Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/unapplied/server/Fix-CraftEntity-hashCode.patch b/patches/server/Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/unapplied/server/Fix-CraftEntity-hashCode.patch rename to patches/server/Fix-CraftEntity-hashCode.patch diff --git a/patches/unapplied/server/Fix-client-rendering-skulls-from-same-user.patch b/patches/server/Fix-client-rendering-skulls-from-same-user.patch similarity index 85% rename from patches/unapplied/server/Fix-client-rendering-skulls-from-same-user.patch rename to patches/server/Fix-client-rendering-skulls-from-same-user.patch index 3e1eba10bb..bd2be3a31c 100644 --- a/patches/unapplied/server/Fix-client-rendering-skulls-from-same-user.patch +++ b/patches/server/Fix-client-rendering-skulls-from-same-user.patch @@ -53,18 +53,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } // CraftBukkit end return itemstack; -diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java +diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java -+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java -@@ -0,0 +0,0 @@ public class ClientboundLevelChunkPacket implements Packet entry2 : chunk.getBlockEntities().entrySet()) { - BlockEntity blockEntity = entry2.getValue(); +--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java ++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java +@@ -0,0 +0,0 @@ public class ClientboundLevelChunkPacketData { + static ClientboundLevelChunkPacketData.BlockEntityInfo create(BlockEntity blockEntity) { CompoundTag compoundTag = blockEntity.getUpdateTag(); + BlockPos blockPos = blockEntity.getBlockPos(); + if (blockEntity instanceof net.minecraft.world.level.block.entity.SkullBlockEntity) { net.minecraft.world.level.block.entity.SkullBlockEntity.sanitizeTileEntityUUID(compoundTag); } // Paper - this.blockEntitiesTags.add(compoundTag); + int i = SectionPos.sectionRelative(blockPos.getX()) << 4 | SectionPos.sectionRelative(blockPos.getZ()); + return new ClientboundLevelChunkPacketData.BlockEntityInfo(i, blockPos.getY(), blockEntity.getType(), compoundTag.isEmpty() ? null : compoundTag); } - diff --git a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java @@ -78,11 +78,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; import net.minecraft.server.players.GameProfileCache; @@ -0,0 +0,0 @@ public class SkullBlockEntity extends BlockEntity { - @Nullable + @Override public ClientboundBlockEntityDataPacket getUpdatePacket() { -- return new ClientboundBlockEntityDataPacket(this.worldPosition, 4, this.getUpdateTag()); -+ return new ClientboundBlockEntityDataPacket(this.worldPosition, 4, sanitizeTileEntityUUID(this.getUpdateTag())); // Paper +- return ClientboundBlockEntityDataPacket.create(this); ++ return ClientboundBlockEntityDataPacket.create(this, e -> sanitizeTileEntityUUID(e.getUpdateTag())); // Paper } + // Paper start @@ -115,4 +115,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + @Override public CompoundTag getUpdateTag() { - return this.save(new CompoundTag()); + return this.saveWithoutMetadata(); diff --git a/patches/unapplied/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from patches/unapplied/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/patches/unapplied/server/Flag-to-disable-the-channel-limit.patch b/patches/server/Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/unapplied/server/Flag-to-disable-the-channel-limit.patch rename to patches/server/Flag-to-disable-the-channel-limit.patch diff --git a/patches/unapplied/server/Implement-EntityKnockbackByEntityEvent.patch b/patches/server/Implement-EntityKnockbackByEntityEvent.patch similarity index 97% rename from patches/unapplied/server/Implement-EntityKnockbackByEntityEvent.patch rename to patches/server/Implement-EntityKnockbackByEntityEvent.patch index 91f6ed770c..e724df28d8 100644 --- a/patches/unapplied/server/Implement-EntityKnockbackByEntityEvent.patch +++ b/patches/server/Implement-EntityKnockbackByEntityEvent.patch @@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 target.push((double) (-Mth.sin(this.getYRot() * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (Mth.cos(this.getYRot() * 0.017453292F) * (float) i * 0.5F)); } @@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity { - if (entityliving != this && entityliving != target && !this.isAlliedTo(entityliving) && (!(entityliving instanceof ArmorStand) || !((ArmorStand) entityliving).isMarker()) && this.distanceToSqr((Entity) entityliving) < 9.0D) { + if (entityliving != this && entityliving != target && !this.isAlliedTo((Entity) entityliving) && (!(entityliving instanceof ArmorStand) || !((ArmorStand) entityliving).isMarker()) && this.distanceToSqr((Entity) entityliving) < 9.0D) { // CraftBukkit start - Only apply knockback if the damage hits if (entityliving.hurt(DamageSource.playerAttack(this).sweep(), f4)) { - entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F))); diff --git a/patches/unapplied/server/Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/unapplied/server/Implement-EntityTeleportEndGatewayEvent.patch rename to patches/server/Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/unapplied/server/Implement-Expanded-ArmorStand-API.patch b/patches/server/Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/unapplied/server/Implement-Expanded-ArmorStand-API.patch rename to patches/server/Implement-Expanded-ArmorStand-API.patch diff --git a/patches/unapplied/server/Implement-World.getEntity-UUID-API.patch b/patches/server/Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/unapplied/server/Implement-World.getEntity-UUID-API.patch rename to patches/server/Implement-World.getEntity-UUID-API.patch diff --git a/patches/unapplied/server/Improve-BlockPosition-inlining.patch b/patches/server/Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/unapplied/server/Improve-BlockPosition-inlining.patch rename to patches/server/Improve-BlockPosition-inlining.patch diff --git a/patches/unapplied/server/Improve-EntityShootBowEvent.patch b/patches/server/Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/unapplied/server/Improve-EntityShootBowEvent.patch rename to patches/server/Improve-EntityShootBowEvent.patch diff --git a/patches/unapplied/server/Improved-Async-Task-Scheduler.patch b/patches/server/Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/unapplied/server/Improved-Async-Task-Scheduler.patch rename to patches/server/Improved-Async-Task-Scheduler.patch diff --git a/patches/unapplied/server/InventoryCloseEvent-Reason-API.patch b/patches/server/InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/unapplied/server/InventoryCloseEvent-Reason-API.patch rename to patches/server/InventoryCloseEvent-Reason-API.patch diff --git a/patches/unapplied/server/ItemStack-getMaxItemUseDuration.patch b/patches/server/ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/unapplied/server/ItemStack-getMaxItemUseDuration.patch rename to patches/server/ItemStack-getMaxItemUseDuration.patch diff --git a/patches/unapplied/server/LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/unapplied/server/LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/server/LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/unapplied/server/MC-135506-Experience-should-save-as-Integers.patch b/patches/server/MC-135506-Experience-should-save-as-Integers.patch similarity index 100% rename from patches/unapplied/server/MC-135506-Experience-should-save-as-Integers.patch rename to patches/server/MC-135506-Experience-should-save-as-Integers.patch diff --git a/patches/unapplied/server/Make-EnderDragon-implement-Mob.patch b/patches/server/Make-EnderDragon-implement-Mob.patch similarity index 100% rename from patches/unapplied/server/Make-EnderDragon-implement-Mob.patch rename to patches/server/Make-EnderDragon-implement-Mob.patch diff --git a/patches/unapplied/server/Make-legacy-ping-handler-more-reliable.patch b/patches/server/Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/unapplied/server/Make-legacy-ping-handler-more-reliable.patch rename to patches/server/Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/unapplied/server/Make-shield-blocking-delay-configurable.patch b/patches/server/Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/unapplied/server/Make-shield-blocking-delay-configurable.patch rename to patches/server/Make-shield-blocking-delay-configurable.patch diff --git a/patches/unapplied/server/Optimize-IntIdentityHashBiMiap-nextId.patch b/patches/server/Optimize-IntIdentityHashBiMiap-nextId.patch similarity index 84% rename from patches/unapplied/server/Optimize-IntIdentityHashBiMiap-nextId.patch rename to patches/server/Optimize-IntIdentityHashBiMiap-nextId.patch index a6de08f3bb..a9b8a0a8a4 100644 --- a/patches/unapplied/server/Optimize-IntIdentityHashBiMiap-nextId.patch +++ b/patches/server/Optimize-IntIdentityHashBiMiap-nextId.patch @@ -17,15 +17,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private int size; + private java.util.BitSet usedIds; // Paper - public CrudeIncrementalIntIdentityHashBiMap(int size) { - size = (int)((float)size / 0.8F); + private CrudeIncrementalIntIdentityHashBiMap(int size) { this.keys = (K[])(new Object[size]); this.values = new int[size]; this.byId = (K[])(new Object[size]); + this.usedIds = new java.util.BitSet(); // Paper } - @Override + public static CrudeIncrementalIntIdentityHashBiMap create(int expectedSize) { @@ -0,0 +0,0 @@ public class CrudeIncrementalIntIdentityHashBiMap implements IdMap { } @@ -41,13 +40,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 return this.nextId; } @@ -0,0 +0,0 @@ public class CrudeIncrementalIntIdentityHashBiMap implements IdMap { - this.byId = (K[])(new Object[newSize]); - this.nextId = 0; - this.size = 0; + this.byId = crudeIncrementalIntIdentityHashBiMap.byId; + this.nextId = crudeIncrementalIntIdentityHashBiMap.nextId; + this.size = crudeIncrementalIntIdentityHashBiMap.size; + this.usedIds.clear(); // Paper + } - for(int i = 0; i < objects.length; ++i) { - if (objects[i] != null) { + public void addMapping(K value, int id) { @@ -0,0 +0,0 @@ public class CrudeIncrementalIntIdentityHashBiMap implements IdMap { this.keys[k] = value; this.values[k] = id; @@ -63,4 +62,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + this.usedIds.clear(); // Paper } - public int size() { + @Override diff --git a/patches/unapplied/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 86% rename from patches/unapplied/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch index ae004d6811..b3eb434ee5 100644 --- a/patches/unapplied/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/patches/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @Override protected void pushEntities() { + if (!level.paperConfig.armorStandEntityLookups) return; // Paper - List list = this.level.getEntities(this, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS); + List list = this.level.getEntities((Entity) this, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS); for (int i = 0; i < list.size(); ++i) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java @@ -46,5 +46,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // Paper end - public Explosion explode(@Nullable Entity entity, double x, double y, double z, float power, Explosion.BlockInteraction destructionType) { - return this.explode(entity, (DamageSource) null, (ExplosionDamageCalculator) null, x, y, z, power, false, destructionType); + public boolean shouldTickDeath(Entity entity) { + return true; diff --git a/patches/unapplied/server/PlayerElytraBoostEvent.patch b/patches/server/PlayerElytraBoostEvent.patch similarity index 100% rename from patches/unapplied/server/PlayerElytraBoostEvent.patch rename to patches/server/PlayerElytraBoostEvent.patch diff --git a/patches/unapplied/server/PlayerLaunchProjectileEvent.patch b/patches/server/PlayerLaunchProjectileEvent.patch similarity index 99% rename from patches/unapplied/server/PlayerLaunchProjectileEvent.patch rename to patches/server/PlayerLaunchProjectileEvent.patch index 68efa2aeda..9816ac9d4c 100644 --- a/patches/unapplied/server/PlayerLaunchProjectileEvent.patch +++ b/patches/server/PlayerLaunchProjectileEvent.patch @@ -212,7 +212,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // CraftBukkit start - moved up /* @@ -0,0 +0,0 @@ public class SnowballItem extends Item { - itemstack.subtract(1); + itemstack.shrink(1); } */ + // Paper end diff --git a/patches/unapplied/server/PlayerReadyArrowEvent.patch b/patches/server/PlayerReadyArrowEvent.patch similarity index 100% rename from patches/unapplied/server/PlayerReadyArrowEvent.patch rename to patches/server/PlayerReadyArrowEvent.patch diff --git a/patches/unapplied/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 89% rename from patches/unapplied/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch index 96141e1259..cf547eecb7 100644 --- a/patches/unapplied/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch +++ b/patches/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch @@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + BlockState blockState = world.getTypeIfLoaded(mutableBlockPos); // Paper + if (blockState == null) { continue; } // Paper if (blockState.is(this) && !this.slightlyMelt(blockState, world, mutableBlockPos)) { - world.getBlockTicks().scheduleTick(mutableBlockPos, this, Mth.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay + world.scheduleTick(mutableBlockPos, this, Mth.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay } @@ -0,0 +0,0 @@ public class FrostedIceBlock extends IceBlock { diff --git a/patches/unapplied/server/Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/unapplied/server/Print-Error-details-when-failing-to-save-player-data.patch rename to patches/server/Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/unapplied/server/RangedEntity-API.patch b/patches/server/RangedEntity-API.patch similarity index 100% rename from patches/unapplied/server/RangedEntity-API.patch rename to patches/server/RangedEntity-API.patch diff --git a/patches/unapplied/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/unapplied/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/unapplied/server/SkeletonHorse-Additions.patch b/patches/server/SkeletonHorse-Additions.patch similarity index 98% rename from patches/unapplied/server/SkeletonHorse-Additions.patch rename to patches/server/SkeletonHorse-Additions.patch index 1c37bd6e05..e05550f616 100644 --- a/patches/unapplied/server/SkeletonHorse-Additions.patch +++ b/patches/server/SkeletonHorse-Additions.patch @@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapG index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java +++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java -@@ -0,0 +0,0 @@ import net.minecraft.world.level.Level; +@@ -0,0 +0,0 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; public class SkeletonTrapGoal extends Goal { private final SkeletonHorse horse; diff --git a/patches/unapplied/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/unapplied/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/unapplied/server/Upstream-config-migrations.patch b/patches/server/Upstream-config-migrations.patch similarity index 100% rename from patches/unapplied/server/Upstream-config-migrations.patch rename to patches/server/Upstream-config-migrations.patch diff --git a/patches/unapplied/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 93% rename from patches/unapplied/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index 2ad43fe0ea..9bea4f88b9 100644 --- a/patches/unapplied/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -10,8 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/build.gradle.kts @@ -0,0 +0,0 @@ dependencies { } - runtimeOnly("org.xerial:sqlite-jdbc:3.34.0") - runtimeOnly("mysql:mysql-connector-java:8.0.23") // Paper + runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3") + runtimeOnly("mysql:mysql-connector-java:8.0.27") + runtimeOnly("com.lmax:disruptor:3.4.4") // Paper runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1") diff --git a/patches/unapplied/server/Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/unapplied/server/Use-ConcurrentHashMap-in-JsonList.patch rename to patches/server/Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch b/patches/server/Use-a-Queue-for-Queueing-Commands.patch similarity index 97% rename from patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch rename to patches/server/Use-a-Queue-for-Queueing-Commands.patch index 7aa41a394d..3b9ca3f4ca 100644 --- a/patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch +++ b/patches/server/Use-a-Queue-for-Queueing-Commands.patch @@ -14,10 +14,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private static final int CONVERSION_RETRIES = 2; private static final Pattern SHA1 = Pattern.compile("^[a-fA-F0-9]{40}$"); - private final List consoleInput = Collections.synchronizedList(Lists.newArrayList()); -+ private final java.util.Queue serverCommandQueue = new java.util.concurrent.ConcurrentLinkedQueue<>(); // Paper - use a proper queue ++ private final java.util.Queue serverCommandQueue = new java.util.concurrent.ConcurrentLinkedQueue<>(); // Paper - use a proper queuemmands + @Nullable private QueryThreadGs4 queryThreadGs4; public final RconConsoleSource rconConsoleSource; - private RconThread rconThread; @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface } diff --git a/patches/unapplied/server/Vanished-players-don-t-have-rights.patch b/patches/server/Vanished-players-don-t-have-rights.patch similarity index 98% rename from patches/unapplied/server/Vanished-players-don-t-have-rights.patch rename to patches/server/Vanished-players-don-t-have-rights.patch index 40aba05c43..d9af9ff999 100644 --- a/patches/unapplied/server/Vanished-players-don-t-have-rights.patch +++ b/patches/server/Vanished-players-don-t-have-rights.patch @@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java @@ -0,0 +0,0 @@ public class BlockItem extends Item { Player entityhuman = context.getPlayer(); - CollisionContext voxelshapecollision = entityhuman == null ? CollisionContext.empty() : CollisionContext.of((Entity) entityhuman); + CollisionContext voxelshapecollision = entityhuman == null ? CollisionContext.empty() : CollisionContext.of(entityhuman); // CraftBukkit start - store default return - boolean defaultReturn = (!this.mustSurvive() || state.canSurvive(context.getLevel(), context.getClickedPos())) && context.getLevel().isUnobstructed(state, context.getClickedPos(), voxelshapecollision); + Level world = context.getLevel(); // Paper diff --git a/patches/unapplied/server/Vex-get-setSummoner-API.patch b/patches/server/Vex-get-setSummoner-API.patch similarity index 100% rename from patches/unapplied/server/Vex-get-setSummoner-API.patch rename to patches/server/Vex-get-setSummoner-API.patch diff --git a/patches/unapplied/server/WitchConsumePotionEvent.patch b/patches/server/WitchConsumePotionEvent.patch similarity index 100% rename from patches/unapplied/server/WitchConsumePotionEvent.patch rename to patches/server/WitchConsumePotionEvent.patch diff --git a/patches/unapplied/server/WitchReadyPotionEvent.patch b/patches/server/WitchReadyPotionEvent.patch similarity index 100% rename from patches/unapplied/server/WitchReadyPotionEvent.patch rename to patches/server/WitchReadyPotionEvent.patch diff --git a/patches/unapplied/server/WitchThrowPotionEvent.patch b/patches/server/WitchThrowPotionEvent.patch similarity index 100% rename from patches/unapplied/server/WitchThrowPotionEvent.patch rename to patches/server/WitchThrowPotionEvent.patch diff --git a/patches/unapplied/server/add-more-information-to-Entity.toString.patch b/patches/server/add-more-information-to-Entity.toString.patch similarity index 97% rename from patches/unapplied/server/add-more-information-to-Entity.toString.patch rename to patches/server/add-more-information-to-Entity.toString.patch index b0a1eeb914..c3e2a472a2 100644 --- a/patches/unapplied/server/add-more-information-to-Entity.toString.patch +++ b/patches/server/add-more-information-to-Entity.toString.patch @@ -9,7 +9,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i } public String toString() { diff --git a/patches/unapplied/Make-max-squid-spawn-height-configurable.patch b/patches/unapplied/Make-max-squid-spawn-height-configurable.patch index 2810390628..8e4b7b9be1 100644 --- a/patches/unapplied/Make-max-squid-spawn-height-configurable.patch +++ b/patches/unapplied/Make-max-squid-spawn-height-configurable.patch @@ -26,11 +26,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java @@ -0,0 +0,0 @@ public class Squid extends WaterAnimal { - public void travel(Vec3 movementInput) { - this.move(MoverType.SELF, this.getDeltaMovement()); } -- -+// AAA + + public static boolean checkSquidSpawnRules(EntityType type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) { +- return pos.getY() > world.getMinecraftWorld().spigotConfig.squidSpawnRangeMin && pos.getY() < world.getSeaLevel(); // Spigot ++ final double maxHeight = world.getMinecraftWorld().paperConfig.squidMaxSpawnHeight > 0 ? world.getMinecraftWorld().paperConfig.squidMaxSpawnHeight : world.getSeaLevel(); // Paper ++ return pos.getY() > world.getMinecraftWorld().spigotConfig.squidSpawnRangeMin && pos.getY() < maxHeight; // Spigot // Paper + } + @Override - public void handleEntityEvent(byte status) { - if (status == 19) {