From f671f3c3fa4bfe15e052e773b15b6a974d6ba809 Mon Sep 17 00:00:00 2001
From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com>
Date: Tue, 24 Jul 2018 19:47:04 -0700
Subject: [PATCH] this was my fault for messing up the pr attempting to resolve
the conflicts, im so stupid smh
---
TotalFreedomMod.iml | 26 +++++++++----------
.../totalfreedommod/command/Command_cage.java | 2 +-
.../totalfreedommod/fun/ItemFun.java | 1 +
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/TotalFreedomMod.iml b/TotalFreedomMod.iml
index 732481ad..bde08f98 100644
--- a/TotalFreedomMod.iml
+++ b/TotalFreedomMod.iml
@@ -46,19 +46,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
index f3205482..996f09bf 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
@@ -96,7 +96,7 @@ public class Command_cage extends FreedomCommand
fPlayer.getCageData().cage(location, outerMaterial, innerMaterial);
}
player.setGameMode(GameMode.SURVIVAL);
-
+ if (outerMaterial == Material.PLAYER_HEAD)
{
FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
index add5bd3a..31c26ba7 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
@@ -56,6 +56,7 @@ public class ItemFun extends FreedomService
switch (event.getMaterial())
{
+ case TROPICAL_FISH:
{
final int RADIUS_HIT = 5;
final int STRENGTH = 4;