fixed a crash that happened when summoning boats

KyaniteMods · Mar 26, 2024 · 545a85b · 545a85b
1 parent 1460122
commit 545a85b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/com/kyanite/deeperdarker/client/render/DDBoatRenderer.java b/src/main/java/com/kyanite/deeperdarker/client/render/DDBoatRenderer.java
@@ -45,8 +45,9 @@ private ListModel<Boat> createBoatModel(EntityRendererProvider.Context context,
 
     @Override
     public Pair<ResourceLocation, ListModel<Boat>> getModelWithLocation(Boat boat) {
-        if(boat instanceof DDBoat ddBoat) return BOAT_RESOURCES.get(ddBoat.getWoodType());
-        if(boat instanceof DDChestBoat ddChestBoat) return BOAT_RESOURCES.get(ddChestBoat.getWoodType());
-        return BOAT_RESOURCES.get("echo");
+        Pair<ResourceLocation, ListModel<Boat>> model = null;
+        if(boat instanceof DDBoat ddBoat) model = BOAT_RESOURCES.get(ddBoat.getWoodType());
+        if(boat instanceof DDChestBoat ddChestBoat) model = BOAT_RESOURCES.get(ddChestBoat.getWoodType());
+        return model == null ? BOAT_RESOURCES.get("bloom") : model;
     }
 }
diff --git a/src/main/java/com/kyanite/deeperdarker/content/entities/SculkLeech.java b/src/main/java/com/kyanite/deeperdarker/content/entities/SculkLeech.java
@@ -54,11 +54,6 @@ public boolean doHurtTarget(Entity pEntity) {
         return super.doHurtTarget(pEntity);
     }
 
-    @Override
-    public void tick() {
-        super.tick();
-    }
-
     @Override
     public void handleEntityEvent(byte pId) {
         if(pId == 4) this.attackState.start(this.tickCount);