diff --git a/gradle.properties b/gradle.properties index 84ea477..d07d8d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = gg.projecteden.parchment version = 1.19.4-R0.1-SNAPSHOT mcVersion = 1.19.4 -paperRef = 85a67dadf28ff329cc01429de84b8b62262435e6 +paperRef = 83948f6f5901edf27e83d8aa5bdca10f1eff63d8 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0008-Expose-MCUtil-Executors.patch b/patches/api/0007-Expose-MCUtil-Executors.patch similarity index 100% rename from patches/api/0008-Expose-MCUtil-Executors.patch rename to patches/api/0007-Expose-MCUtil-Executors.patch diff --git a/patches/api/0009-Add-BlockDropResourcesEvent.patch b/patches/api/0008-Add-BlockDropResourcesEvent.patch similarity index 100% rename from patches/api/0009-Add-BlockDropResourcesEvent.patch rename to patches/api/0008-Add-BlockDropResourcesEvent.patch diff --git a/patches/api/0010-Add-Furnace-Recipe-API.patch b/patches/api/0009-Add-Furnace-Recipe-API.patch similarity index 100% rename from patches/api/0010-Add-Furnace-Recipe-API.patch rename to patches/api/0009-Add-Furnace-Recipe-API.patch diff --git a/patches/api/0011-Add-HangingFrame-Tick-API.patch b/patches/api/0010-Add-HangingFrame-Tick-API.patch similarity index 100% rename from patches/api/0011-Add-HangingFrame-Tick-API.patch rename to patches/api/0010-Add-HangingFrame-Tick-API.patch diff --git a/patches/api/0012-Add-Player-getHiddenEntities-API.patch b/patches/api/0011-Add-Player-getHiddenEntities-API.patch similarity index 100% rename from patches/api/0012-Add-Player-getHiddenEntities-API.patch rename to patches/api/0011-Add-Player-getHiddenEntities-API.patch diff --git a/patches/api/0013-Add-Timings-Events.patch b/patches/api/0012-Add-Timings-Events.patch similarity index 100% rename from patches/api/0013-Add-Timings-Events.patch rename to patches/api/0012-Add-Timings-Events.patch diff --git a/patches/api/0014-Expanded-Insomnia-API-methods.patch b/patches/api/0013-Expanded-Insomnia-API-methods.patch similarity index 100% rename from patches/api/0014-Expanded-Insomnia-API-methods.patch rename to patches/api/0013-Expanded-Insomnia-API-methods.patch diff --git a/patches/api/0015-Add-NPC-to-EntityType.patch b/patches/api/0014-Add-NPC-to-EntityType.patch similarity index 100% rename from patches/api/0015-Add-NPC-to-EntityType.patch rename to patches/api/0014-Add-NPC-to-EntityType.patch diff --git a/patches/api/0016-Revert-BungeeChat-Deprecation.patch b/patches/api/0015-Revert-BungeeChat-Deprecation.patch similarity index 100% rename from patches/api/0016-Revert-BungeeChat-Deprecation.patch rename to patches/api/0015-Revert-BungeeChat-Deprecation.patch diff --git a/patches/api/0017-Add-PreEntityShootBowEvent.patch b/patches/api/0016-Add-PreEntityShootBowEvent.patch similarity index 100% rename from patches/api/0017-Add-PreEntityShootBowEvent.patch rename to patches/api/0016-Add-PreEntityShootBowEvent.patch diff --git a/patches/api/0007-Expose-NMS-ordinals.patch b/patches/removed/api/0007-Expose-NMS-ordinals.patch similarity index 100% rename from patches/api/0007-Expose-NMS-ordinals.patch rename to patches/removed/api/0007-Expose-NMS-ordinals.patch diff --git a/patches/server/0007-Expose-EntityType-Ordinals.patch b/patches/removed/server/0007-Expose-EntityType-Ordinals.patch similarity index 100% rename from patches/server/0007-Expose-EntityType-Ordinals.patch rename to patches/removed/server/0007-Expose-EntityType-Ordinals.patch diff --git a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch index d764e99..376e6da 100644 --- a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch +++ b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add origin location to EntityDamageByBlockEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 451088940d1db0f32c29d0fd192c97b50cf3c4c8..1567206096d5010d5d4d9d58dcaaa7b6f6715943 100644 +index fd9d0efafaf17bf0551693de2e166ac59a996abd..63ddbed83af9b8bfd237ca0c6b0727317dafe03f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -972,7 +972,7 @@ public class CraftEventFactory { +@@ -971,7 +971,7 @@ public class CraftEventFactory { CraftEventFactory.entityDamage = null; EntityDamageEvent event; if (damager == null) { @@ -17,21 +17,21 @@ index 451088940d1db0f32c29d0fd192c97b50cf3c4c8..1567206096d5010d5d4d9d58dcaaa7b6 } else if (entity instanceof EnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) { event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions); } else { -@@ -1012,7 +1012,7 @@ public class CraftEventFactory { +@@ -1011,7 +1011,7 @@ public class CraftEventFactory { return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API - } else if (sourceType == DamageTypes.OUT_OF_WORLD) { + } else if (source.is(DamageTypes.OUT_OF_WORLD)) { - EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, modifiers, modifierFunctions); + EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, entity.getBukkitEntity().getLocation(), modifiers, modifierFunctions); event.setCancelled(cancelled); CraftEventFactory.callEvent(event); if (!event.isCancelled()) { -@@ -1022,7 +1022,7 @@ public class CraftEventFactory { +@@ -1021,7 +1021,7 @@ public class CraftEventFactory { } return event; - } else if (sourceType == DamageTypes.LAVA) { + } else if (source.is(DamageTypes.LAVA)) { - EntityDamageEvent event = (new EntityDamageByBlockEvent(CraftEventFactory.blockDamage, entity.getBukkitEntity(), DamageCause.LAVA, modifiers, modifierFunctions)); -+ EntityDamageEvent event = (new EntityDamageByBlockEvent(CraftEventFactory.blockDamage, entity.getBukkitEntity(), DamageCause.LAVA, entity.getBukkitEntity().getLocation(), modifiers, modifierFunctions)); ++ EntityDamageEvent event = (new EntityDamageByBlockEvent(CraftEventFactory.blockDamage, entity.getBukkitEntity(), DamageCause.LAVA, blockDamage.getLocation(), modifiers, modifierFunctions)); event.setCancelled(cancelled); Block damager = CraftEventFactory.blockDamage; diff --git a/patches/server/0008-Add-Player-setGameProfile.patch b/patches/server/0007-Add-Player-setGameProfile.patch similarity index 100% rename from patches/server/0008-Add-Player-setGameProfile.patch rename to patches/server/0007-Add-Player-setGameProfile.patch diff --git a/patches/server/0009-Expose-MCUtil-Executors.patch b/patches/server/0008-Expose-MCUtil-Executors.patch similarity index 100% rename from patches/server/0009-Expose-MCUtil-Executors.patch rename to patches/server/0008-Expose-MCUtil-Executors.patch diff --git a/patches/server/0010-Fix-missing-CraftMetaSkull-serializedProfile.patch b/patches/server/0009-Fix-missing-CraftMetaSkull-serializedProfile.patch similarity index 100% rename from patches/server/0010-Fix-missing-CraftMetaSkull-serializedProfile.patch rename to patches/server/0009-Fix-missing-CraftMetaSkull-serializedProfile.patch diff --git a/patches/server/0011-Add-BlockDropResourcesEvent.patch b/patches/server/0010-Add-BlockDropResourcesEvent.patch similarity index 96% rename from patches/server/0011-Add-BlockDropResourcesEvent.patch rename to patches/server/0010-Add-BlockDropResourcesEvent.patch index 8681f9c..72ec0d5 100644 --- a/patches/server/0011-Add-BlockDropResourcesEvent.patch +++ b/patches/server/0010-Add-BlockDropResourcesEvent.patch @@ -49,10 +49,10 @@ index 4f91e4832a94c3facbc711fcae4cb5ad540a5ca0..c357e09705c5405dc8fac666fc39c993 }); state.spawnAfterBreak((ServerLevel) world, pos, tool, true); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 1567206096d5010d5d4d9d58dcaaa7b6f6715943..ae6026a6bccfa70c06c96925175608db4a37781d 100644 +index 63ddbed83af9b8bfd237ca0c6b0727317dafe03f..df7cbca1fe99bdb47a112e7a0cb7b81496586518 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1991,5 +1991,19 @@ public class CraftEventFactory { +@@ -1990,5 +1990,19 @@ public class CraftEventFactory { } }); } diff --git a/patches/server/0012-Add-Furnace-Recipe-API.patch b/patches/server/0011-Add-Furnace-Recipe-API.patch similarity index 100% rename from patches/server/0012-Add-Furnace-Recipe-API.patch rename to patches/server/0011-Add-Furnace-Recipe-API.patch diff --git a/patches/server/0013-Disable-sleep-status-announcements.patch b/patches/server/0012-Disable-sleep-status-announcements.patch similarity index 100% rename from patches/server/0013-Disable-sleep-status-announcements.patch rename to patches/server/0012-Disable-sleep-status-announcements.patch diff --git a/patches/server/0014-Add-config-for-ticking-TIME_SINCE_REST.patch b/patches/server/0013-Add-config-for-ticking-TIME_SINCE_REST.patch similarity index 100% rename from patches/server/0014-Add-config-for-ticking-TIME_SINCE_REST.patch rename to patches/server/0013-Add-config-for-ticking-TIME_SINCE_REST.patch diff --git a/patches/server/0015-Add-HangingFrame-Tick-API.patch b/patches/server/0014-Add-HangingFrame-Tick-API.patch similarity index 100% rename from patches/server/0015-Add-HangingFrame-Tick-API.patch rename to patches/server/0014-Add-HangingFrame-Tick-API.patch diff --git a/patches/server/0016-Add-Player-getHiddenEntities-API.patch b/patches/server/0015-Add-Player-getHiddenEntities-API.patch similarity index 100% rename from patches/server/0016-Add-Player-getHiddenEntities-API.patch rename to patches/server/0015-Add-Player-getHiddenEntities-API.patch diff --git a/patches/server/0017-Big-Barrels.patch b/patches/server/0016-Big-Barrels.patch similarity index 94% rename from patches/server/0017-Big-Barrels.patch rename to patches/server/0016-Big-Barrels.patch index 0c0ec12..74d96e1 100644 --- a/patches/server/0017-Big-Barrels.patch +++ b/patches/server/0016-Big-Barrels.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Big Barrels diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java -index f52487e1cfcfab1bf22ab2cb52f998283a86e340..9f8394d0348b068623b3acafe18b40a3ed0503d0 100644 +index 416aa989ebb18a8741cc9d605a1180ab830f6643..c48466a4d2115f4fa6121b6bcba87b838743af34 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java @@ -67,7 +67,7 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity { diff --git a/patches/server/0018-Add-Timings-Events.patch b/patches/server/0017-Add-Timings-Events.patch similarity index 100% rename from patches/server/0018-Add-Timings-Events.patch rename to patches/server/0017-Add-Timings-Events.patch diff --git a/patches/server/0019-Expanded-Insomnia-API.patch b/patches/server/0018-Expanded-Insomnia-API.patch similarity index 100% rename from patches/server/0019-Expanded-Insomnia-API.patch rename to patches/server/0018-Expanded-Insomnia-API.patch diff --git a/patches/server/0020-Add-spam-bypass-permission.patch b/patches/server/0019-Add-spam-bypass-permission.patch similarity index 100% rename from patches/server/0020-Add-spam-bypass-permission.patch rename to patches/server/0019-Add-spam-bypass-permission.patch diff --git a/patches/server/0021-Disable-set-respawn-message.patch b/patches/server/0020-Disable-set-respawn-message.patch similarity index 100% rename from patches/server/0021-Disable-set-respawn-message.patch rename to patches/server/0020-Disable-set-respawn-message.patch diff --git a/patches/server/0022-Make-FixLight-use-action-bar.patch b/patches/server/0021-Make-FixLight-use-action-bar.patch similarity index 96% rename from patches/server/0022-Make-FixLight-use-action-bar.patch rename to patches/server/0021-Make-FixLight-use-action-bar.patch index cbd29b6..c0e5210 100644 --- a/patches/server/0022-Make-FixLight-use-action-bar.patch +++ b/patches/server/0021-Make-FixLight-use-action-bar.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make FixLight use action bar diff --git a/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java b/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java -index 450bd95218852174cfbc88d4517e17daee5ffd5f..794842cb3dfa0732ccecf625b97dbc6c311a8a18 100644 +index 7784d72ddd6db00c674e22759c00c430222c4b85..b336789b74d6d6819b38e78cb2014f61de3f004b 100644 --- a/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java +++ b/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java @@ -24,6 +24,7 @@ import static net.kyori.adventure.text.format.NamedTextColor.BLUE; diff --git a/patches/server/0023-Remove-Unneeded-Override.patch b/patches/server/0022-Remove-Unneeded-Override.patch similarity index 100% rename from patches/server/0023-Remove-Unneeded-Override.patch rename to patches/server/0022-Remove-Unneeded-Override.patch diff --git a/patches/server/0024-Remove-Hanging-Entity-Debug.patch b/patches/server/0023-Remove-Hanging-Entity-Debug.patch similarity index 100% rename from patches/server/0024-Remove-Hanging-Entity-Debug.patch rename to patches/server/0023-Remove-Hanging-Entity-Debug.patch diff --git a/patches/server/0025-Add-PreEntityShootBowEvent.patch b/patches/server/0024-Add-PreEntityShootBowEvent.patch similarity index 100% rename from patches/server/0025-Add-PreEntityShootBowEvent.patch rename to patches/server/0024-Add-PreEntityShootBowEvent.patch diff --git a/patches/server/0025-Lookup-plugin-dependencies-during-runtime.patch b/patches/server/0025-Lookup-plugin-dependencies-during-runtime.patch new file mode 100644 index 0000000..9e40342 --- /dev/null +++ b/patches/server/0025-Lookup-plugin-dependencies-during-runtime.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Blast-MC +Date: Sun, 19 Mar 2023 17:32:26 -0400 +Subject: [PATCH] Lookup plugin dependencies during runtime + + +diff --git a/src/main/java/io/papermc/paper/plugin/entrypoint/dependency/DependencyUtil.java b/src/main/java/io/papermc/paper/plugin/entrypoint/dependency/DependencyUtil.java +index bfa258faf17ca6118aeddfa4e95bbd082bcd1390..c106c26ccd673e46c5ae9415096923b66efd8af2 100644 +--- a/src/main/java/io/papermc/paper/plugin/entrypoint/dependency/DependencyUtil.java ++++ b/src/main/java/io/papermc/paper/plugin/entrypoint/dependency/DependencyUtil.java +@@ -2,6 +2,7 @@ package io.papermc.paper.plugin.entrypoint.dependency; + + import com.google.common.graph.MutableGraph; + import io.papermc.paper.plugin.configuration.PluginMeta; ++import io.papermc.paper.plugin.manager.PaperPluginManagerImpl; + import io.papermc.paper.plugin.provider.PluginProvider; + import io.papermc.paper.plugin.provider.configuration.LoadOrderConfiguration; + import org.bukkit.plugin.PluginDescriptionFile; +@@ -65,7 +66,7 @@ public class DependencyUtil { + public static List validateSimple(PluginMeta meta, Map> toLoad) { + List missingDependencies = new ArrayList<>(); + for (String hardDependency : meta.getPluginDependencies()) { +- if (!toLoad.containsKey(hardDependency)) { ++ if (!toLoad.containsKey(hardDependency) && !PaperPluginManagerImpl.getInstance().isPluginEnabled(hardDependency)) { + missingDependencies.add(hardDependency); + } + }