Fixed how loot tables is being determined. Closes #99

TeamMetallurgy · Mar 21, 2020 · 0b87e2b · 0b87e2b
1 parent 00f2292
commit 0b87e2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishEntity.java b/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishEntity.java
@@ -39,8 +39,9 @@ protected void registerGoals() {
         super.registerGoals();
 
         this.goalSelector.goals.forEach(prioritizedGoal -> { //Removes vanilla schooling goal
-            if (prioritizedGoal.getGoal().getClass() == FollowSchoolLeaderGoal.class)
+            if (prioritizedGoal.getGoal().getClass() == FollowSchoolLeaderGoal.class) {
                 this.goalSelector.removeGoal(prioritizedGoal.getGoal());
+            }
         });
         this.goalSelector.addGoal(5, new FollowTypeSchoolLeaderGoal(this));
     }

diff --git a/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishingBobberEntity.java b/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishingBobberEntity.java
@@ -43,7 +43,6 @@
 import net.minecraftforge.items.ItemStackHandler;
 
 import javax.annotation.Nonnull;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -186,24 +185,18 @@ public int handleHookRetraction(@Nonnull ItemStack stack) {
     }
 
     private List<ItemStack> getLoot(LootContext.Builder builder, ServerWorld serverWorld) {
-        IFluidState fluidState = this.world.getFluidState(new BlockPos(this));
-        ResourceLocation lootTableLocation = null;
-        if (fluidState.isTagged(FluidTags.WATER)) {
-            lootTableLocation = LootTables.GAMEPLAY_FISHING;
-        }
+        ResourceLocation lootTableLocation;
         if (this.isLavaHookInLava(this, this.world, new BlockPos(this))) {
             if (serverWorld.getWorld().getDimension().isNether()) {
                 lootTableLocation = AquaLootTables.NETHER_FISHING;
             } else {
                 lootTableLocation = AquaLootTables.LAVA_FISHING;
             }
-        }
-        if (lootTableLocation == null) {
-            return new ArrayList<>();
         } else {
-            LootTable lootTable = serverWorld.getServer().getLootTableManager().getLootTableFromLocation(lootTableLocation);
-            return lootTable.generate(builder.build(LootParameterSets.FISHING));
+            lootTableLocation = LootTables.GAMEPLAY_FISHING;
         }
+        LootTable lootTable = serverWorld.getServer().getLootTableManager().getLootTableFromLocation(lootTableLocation);
+        return lootTable.generate(builder.build(LootParameterSets.FISHING));
     }
 
     private void spawnLoot(List<ItemStack> lootEntries) {