oop

2025-06-29 19:46:42 +00:00 · 2019-11-03 14:43:29 -07:00
parent b525e53348 d582398f93
commit 1d932e2c7b
17 changed files with 934 additions and 109 deletions
--- a/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
@ -141,11 +141,14 @@ public class ItemFun extends FreedomService
                {
                    break;
                }
+<<<<<<< HEAD
                
                /*if (player.getWorld().equals(plugin.wm.hubworld.getWorld()) && plugin.hwr.doRestrict(player))
                {
                    break;
                }*/
+=======
+>>>>>>> d582398f932330853b0456b684654da4c860e831

                Location location = player.getLocation().clone();