From 200926d41d948005d17d3aea8a04ea75c2d6c677 Mon Sep 17 00:00:00 2001
From: jojo <yoyosource@nidido.de>
Date: Wed, 27 Jan 2021 09:50:41 +0100
Subject: [PATCH] Fix merge conflicts

---
 .../de/steamwar/bausystem/commands/CommandFreeze.java  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java
index b3f05c6..507c454 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java
@@ -88,16 +88,6 @@ public class CommandFreeze extends RegionToggleCommand {
         });
     }
 
-    @EventHandler
-    public void onEntitySpawn(EntitySpawnEvent e) {
-        e.setCancelled(true);
-    }
-
-    @EventHandler
-    public void onEntityChangeBlock(EntityChangeBlockEvent e) {
-        e.setCancelled(true);
-    }
-
     @EventHandler
     public void onPhysicsEvent(BlockPhysicsEvent e){
         Region.getRegion(e.getBlock().getLocation(), region -> {