Fixed merge conflict due to indentation.

Author: AMorporkian

plugins/bouncer_plugin/bouncer_plugin.py

@@ -20,7 +20,8 @@ def activate(self):
             "DAMAGE_TILE",
             "DAMAGE_TILE_GROUP",
             "REQUEST_DROP",
-            "ENTITY_INTERACT"
+            "ENTITY_INTERACT",
+            "MODIFY_TILE_LIST"
         ]
         for n in ["on_" + n.lower() for n in bad_packets]:
             setattr(self, n,

plugins/planet_protect/planet_protect_plugin.py

@@ -16,17 +16,17 @@ class PlanetProtectPlugin(SimpleCommandPlugin):
     def activate(self):
         super(PlanetProtectPlugin, self).activate()
         bad_packets = [
-            "CONNECT_WIRE",
-            "DISCONNECT_ALL_WIRES",
-            "OPEN_CONTAINER",
-            "CLOSE_CONTAINER",
-            "SWAP_IN_CONTAINER",
-            "DAMAGE_TILE",
-            "DAMAGE_TILE_GROUP",
-            "REQUEST_DROP",
-            "ENTITY_INTERACT"
-        ]
-        for n in ["on_" + n.lower() for n in bad_packets]:
+                        "CONNECT_WIRE",
+                        "DISCONNECT_ALL_WIRES",
+                        "OPEN_CONTAINER",
+                        "CLOSE_CONTAINER",
+                        "SWAP_IN_CONTAINER",
+                        "DAMAGE_TILE",
+                        "DAMAGE_TILE_GROUP",
+                        "REQUEST_DROP",
+                        "ENTITY_INTERACT",
+                        "MODIFY_TILE_LIST"]
+        for n in ["on_"+n.lower() for n in bad_packets]:
             setattr(self, n, (lambda x: self.planet_check()))
         try:
             with open("plugins/planet_protect/protected_planets.json") as f: