[Version 0.7.3.3]

- Added "ignoreEntrance" option to not check entrance to gate on
integrity check (Workaround for snowmen until event is pulled)

src/config.yml

@@ -15,6 +15,8 @@ maxgates: 0
 lang: en
 # Whether to remember the cursor location between uses
 destMemory: false
+# Ignore the entrance blocks of a gate when checking. Used to work around snowmen
+ignoreEntrance: false
 
 # Stargate economy options
 

src/net/TheDgtl/Stargate/Gate.java

@@ -227,6 +227,9 @@ public class Gate {
 				int id = types.get(layout[y][x]);
 
 				if (id == ENTRANCE || id == EXIT) {
+					// TODO: Remove once snowmanTrailEvent is added
+					if (Stargate.ignoreEntrance) continue;
+					
 					int type = topleft.modRelative(x, y, 0, modX, 1, modZ).getType();
 					if (type != portalBlockClosed && type != portalBlockOpen) {
 						// Special case for water gates

src/net/TheDgtl/Stargate/Stargate.java

@@ -84,6 +84,9 @@ public class Stargate extends JavaPlugin {
 	private static int openTime = 10;
 	public static boolean destMemory = false;
 	
+	// Temp workaround for snowmen, don't check gate entrance
+	public static boolean ignoreEntrance = false;
+	
 	// Used for debug
 	public static boolean debug = false;
 	public static boolean permDebug = false;
@@ -134,11 +137,14 @@ public class Stargate extends JavaPlugin {
 		pm.registerEvent(Event.Type.BLOCK_BREAK, blockListener, Priority.Normal, this);
 		pm.registerEvent(Event.Type.SIGN_CHANGE, blockListener, Priority.Normal, this);
 		
+		
 		pm.registerEvent(Event.Type.VEHICLE_MOVE, vehicleListener, Priority.Normal, this);
 		
 		pm.registerEvent(Event.Type.WORLD_LOAD, worldListener, Priority.Normal, this);
 		
 		pm.registerEvent(Event.Type.ENTITY_EXPLODE, entityListener, Priority.Normal, this);
+		// TODO: Add when snowmanTrailEvent is pulled
+		//pm.registerEvent(Event.Type.SNOWMAN_TRAIL, entityListener, Priority.Normal, this);
 		//pm.registerEvent(Event.Type.ENTITY_DAMAGE, entityListener, Priority.Normal, this);
 		//pm.registerEvent(Event.Type.ENTITY_COMBUST, entityListener, Priority.Normal, this);
 		
@@ -166,6 +172,7 @@ public class Stargate extends JavaPlugin {
 		maxGates = newConfig.getInt("maxgates");
 		langName = newConfig.getString("lang");
 		destMemory = newConfig.getBoolean("destMemory");
+		ignoreEntrance = newConfig.getBoolean("ignoreEntrance");
 		// Debug
 		debug = newConfig.getBoolean("debug");
 		permDebug = newConfig.getBoolean("permdebug");
@@ -882,9 +889,8 @@ public class Stargate extends JavaPlugin {
 		@Override
 		public void onBlockPhysics(BlockPhysicsEvent event) {
 			Block block = event.getBlock();
-			if (block.getType() == Material.PORTAL) {
-				event.setCancelled((Portal.getByEntrance(block) != null));
-			}
+			Portal portal = Portal.getByEntrance(block);
+			if (portal != null) event.setCancelled(true);
 		}
 
 		@Override
@@ -924,6 +930,15 @@ public class Stargate extends JavaPlugin {
 				}
 			}
 		}
+		// TODO: Uncomment when Bukkit pulls SnowmanTrailEvent
+		/*
+		@Override
+		public void onSnowmanTrail(SnowmanTrailEvent event) {
+			Portal p = Portal.getByEntrance(event.getBlock());
+			if (p != null) event.setCancelled(true);
+		}
+		*/
+		
 		// Going to leave this commented out until they fix EntityDamagebyBlock
 		/*
 		@Override

src/plugin.yml

@@ -1,6 +1,6 @@
 name: Stargate
 main: net.TheDgtl.Stargate.Stargate
-version: 0.7.3.2
+version: 0.7.3.3
 description: Stargate mod for Bukkit
 author: Drakia
 website: http://www.thedgtl.net