merge fix

src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java

@@ -1,8 +1,5 @@
-<<<<<<<< HEAD:src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java
+
 package jesse.keeblarcraft.EventMgr;
-========
-package jesse.keeblarcraft.Utils;
->>>>>>>> d94f405 ([5] Initial implementation of some attribute stuff. Nothing in this commit actually works but the game still launches! Will need to move item and armor stuff to a more generic file as well to make it less unique so it can be used broadly. Directory structure extended to add items and resources):src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java
 
 import jesse.CommonServerUtils;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;

src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java

@@ -1,25 +0,0 @@
-<<<<<<<< HEAD:src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java
-package jesse.keeblarcraft.EventMgr;
-========
-package jesse.keeblarcraft.Utils;
->>>>>>>> d94f405 ([5] Initial implementation of some attribute stuff. Nothing in this commit actually works but the game still launches! Will need to move item and armor stuff to a more generic file as well to make it less unique so it can be used broadly. Directory structure extended to add items and resources):src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java
-
-import jesse.CommonServerUtils;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
-import net.minecraft.server.MinecraftServer;
-
-// This interface is responsible for the end tick of a server world event tick
-public class ServerTickListener implements ServerTickEvents.EndTick {
-    CommonServerUtils config = new CommonServerUtils();
-    @Override
-    public void onEndTick(MinecraftServer server) {
-        if (server != null) {
-            config.SetServerInstance(server);
-        }
-    }
-
-    // Static method to register the server tick listener
-    public static void InitializeServerTicks() {
-        ServerTickEvents.END_SERVER_TICK.register(new ServerTickListener());
-    }
-}

src/main/resources/data/keeblarcraft/loot_tables/blocks/money_block.json

@@ -5,7 +5,7 @@
             "bonus_rolls": 0.0,
             "conditions": [
                 {
-                    "conditions": "minecraft:survives_explosions"
+                    "condition": "minecraft:survives_explosion"
                 }
             ],
             "entries": [