Fix some compilation errors

2024-12-15 21:28:08 +01:00
parent de10a277e2
commit 6dcb4a33b6
12 changed files with 74 additions and 27 deletions
--- a/paper-server/patches/sources/net/minecraft/world/entity/animal/Dolphin.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/animal/Dolphin.java.patch
@@ -39,15 +39,6 @@
             }
         }
     }
-@@ -341,7 +_,7 @@
- 
-     @Nullable
-     @Override
-    protected SoundEvent getDeathSound() {
-+    public SoundEvent getDeathSound() { // Paper - decompile error
-         return SoundEvents.DOLPHIN_DEATH;
-     }
- 
@@ -497,7 +_,7 @@
 
         @Override
--- a/paper-server/patches/sources/net/minecraft/world/entity/npc/ClientSideMerchant.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/npc/ClientSideMerchant.java.patch
@@ -0,0 +1,16 @@
+--- a/net/minecraft/world/entity/npc/ClientSideMerchant.java
+++ b/net/minecraft/world/entity/npc/ClientSideMerchant.java
+@@ -56,6 +_,13 @@
+         return this.source == player;
+     }
+ 
+    // Paper start
+    @Override
+    public org.bukkit.craftbukkit.inventory.CraftMerchant getCraftMerchant() {
+        throw new UnsupportedOperationException();
+    }
+    // Paper end
+
+     @Override
+     public int getVillagerXp() {
+         return this.xp;