update restamp, add back entity ATs, rebuild patches

2024-12-15 22:39:52 +01:00
parent acd43900f5
commit 8f1dcdd0b7
6 changed files with 25 additions and 26 deletions
--- a/paper-server/patches/sources/net/minecraft/world/entity/npc/Villager.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/npc/Villager.java.patch
@@ -88,15 +88,6 @@
                 double d = 0.3 + 0.0625 * amplifier;
                 int i = (int)Math.floor(d * merchantOffer1.getBaseCostA().getCount());
                 merchantOffer1.addToSpecialPriceDiff(-Math.max(i, 1));
-@@ -559,7 +_,7 @@
-     }
- 
-     @Override
-    protected SoundEvent getDeathSound() {
-+    public SoundEvent getDeathSound() {
-         return SoundEvents.VILLAGER_DEATH;
-     }
- 
@@ -594,7 +_,7 @@
         }
 
--- a/paper-server/patches/sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch
@@ -70,15 +70,6 @@
         }
     }
 
-@@ -204,7 +_,7 @@
-     }
- 
-     @Override
-    protected SoundEvent getDeathSound() {
-+    public SoundEvent getDeathSound() {
-         return SoundEvents.WANDERING_TRADER_DEATH;
-     }
- 
@@ -241,7 +_,7 @@
 
     private void maybeDespawn() {