diff --git a/gradle.properties b/gradle.properties index 27d6cc8..5d92082 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.lexikiq version = 1.17.1-R0.1-SNAPSHOT mcVersion = 1.17.1 -paperRef = 2cd4bcfba17affba734619682800fa47ed8e2c7f +paperRef = 20903fcf5e227a1a03e2afd89f01bfe951b2b328 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0003-Add-SoundEvent.patch b/patches/server/0003-Add-SoundEvent.patch index 8d7b9ba..37b9901 100644 --- a/patches/server/0003-Add-SoundEvent.patch +++ b/patches/server/0003-Add-SoundEvent.patch @@ -85,10 +85,10 @@ index a79ba23ecf887ecbb6e095140f019ebb6fd0a6f7..5112edc5e68a386e9bb16ac0ec9d998e } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index db6c0917824b9127abd9f9250dc195a9f1d56f4f..edaebb2566a414718d0910d4306c3b53e061814c 100644 +index 31bbf018e3b7cafb1e186c7d00b421fb133331a3..b39b05c7f6bd83f39a76c71735cfdee0f46339ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1858,4 +1858,77 @@ public class CraftEventFactory { +@@ -1873,4 +1873,77 @@ public class CraftEventFactory { return event.callEvent(); } // Paper end diff --git a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch index b737de7..542a7ec 100644 --- a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch +++ b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch @@ -146,10 +146,10 @@ index 88439b8f82a97a9763dadfc6c9dbaf0912ab3eb7..73a9b765b58bb547712c014c8b908653 public static boolean canSetSpawn(Level world) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index edaebb2566a414718d0910d4306c3b53e061814c..3d4ff819bb46b346cb84844c68a9e963cf4b0890 100644 +index b39b05c7f6bd83f39a76c71735cfdee0f46339ba..d70a223533210fe582ee8b05dd2dd3e3763ba14c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -950,7 +950,7 @@ public class CraftEventFactory { +@@ -954,7 +954,7 @@ public class CraftEventFactory { CraftEventFactory.entityDamage = null; EntityDamageEvent event; if (damager == null) { @@ -158,7 +158,7 @@ index edaebb2566a414718d0910d4306c3b53e061814c..3d4ff819bb46b346cb84844c68a9e963 } else if (entity instanceof EnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) { event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions); } else { -@@ -986,7 +986,7 @@ public class CraftEventFactory { +@@ -990,7 +990,7 @@ public class CraftEventFactory { return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled); } else if (source == DamageSource.OUT_OF_WORLD) { @@ -167,7 +167,7 @@ index edaebb2566a414718d0910d4306c3b53e061814c..3d4ff819bb46b346cb84844c68a9e963 event.setCancelled(cancelled); CraftEventFactory.callEvent(event); if (!event.isCancelled()) { -@@ -994,7 +994,7 @@ public class CraftEventFactory { +@@ -998,7 +998,7 @@ public class CraftEventFactory { } return event; } else if (source == DamageSource.LAVA) { diff --git a/patches/server/0011-Add-BlockDropResourcesEvent.patch b/patches/server/0011-Add-BlockDropResourcesEvent.patch index 4c387d3..5733d8b 100644 --- a/patches/server/0011-Add-BlockDropResourcesEvent.patch +++ b/patches/server/0011-Add-BlockDropResourcesEvent.patch @@ -48,10 +48,10 @@ index 8c30e28b97ac7e8b54322c903e0b75ee8135620b..4ca85a02a1eb46b5958aae55946c67ce }); state.spawnAfterBreak((ServerLevel) world, pos, stack); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 3d4ff819bb46b346cb84844c68a9e963cf4b0890..9f35b873f928d4cbf5b6653e1e2dd3148ff03483 100644 +index d70a223533210fe582ee8b05dd2dd3e3763ba14c..e6fb8712afe5bc75ed7ada7b515d89020869c78f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1930,5 +1930,11 @@ public class CraftEventFactory { +@@ -1945,5 +1945,11 @@ public class CraftEventFactory { final double posZ = pos.getZ(); playSoundEvent(event, packet -> playerList.broadcast(player, posX, posY, posZ, radius, world, packet)); }