Updated the pom file for version 2.2.0

Conflicts:
	pom.xml
	src/de/craftinc/gates/BaseGate.java
	src/de/craftinc/gates/commands/BaseCommand.java
	src/de/craftinc/gates/commands/CommandCreate.java
	src/de/craftinc/gates/commands/CommandList.java

.classpath

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="lib" path="/Users/tobi/Code/Vault.jar"/>
-	<classpathentry kind="lib" path="/Users/tobi/Code/craftbukkit-1.4.5-R1.0.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/Users/tobi/Code/craftbukkit-1.5.1-R0.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -28,3 +28,6 @@ profile
 
 # bukkit
 bukkit/
+
+# bukkit test-server
+bukkit-testserver/

AUTHORS.txt

@@ -0,0 +1,13 @@
+The following persons contributed to Craft Inc. Gates (previously named Ancient Gates):
+
+CURRENT MAINTAINER
+
+	Tobias Ottenweller <mail@ottenweller.net>
+	Paul Schulze <info@paul-schulze.de>
+
+
+FORMER CONTRIBUTOR (alphabetical order)
+
+	Jacob Brunson <jacob@dimensionsmachine.com>
+	locutus <bladedpenguin@gmail.com>
+	Olof Larsson <olof@sylt.nu>

README.md

@@ -1,51 +1,93 @@
-# Craft Inc. Gates – Easily create portals with custom design
 
-(previously known as __AncientGates__)
+# Craft Inc. Gates #
 
-With this plugin players can create gates that will teleport anyone who enter the gate to specific a location.
+<Logo here>
-The hightlights are: __It is so darn easy to use!__ and __The gates can look any way you like__
 
-Try the ingame command: __/gate__
+We are happy to finally announce __Craft Inc. Gates__. 
 
-Also have a look at the full __[userguide](http://www.craftinc.de/blog/?p=255)__.
+This awesome plugin lets you _travel_ to far away places and worlds _faster than light_! Just create a gate at any location and set an exit somewhere else.
 
-Thought first you should take a look at the demonstration oloflarsson and karibu6 created:
+This has been made available by the hard work of the research and development department of the _Craft Inc. Corporation_. Under the lead of Professor Ddidderr Craftman scientists worked years to find a way to bend time and space inside the Minecraft universe to enable _ultra fast transportation_.
-__[http://www.youtube.com/watch?v=L4hyqTpeEaA](http://www.youtube.com/watch?v=L4hyqTpeEaA)__
+
+Now it is time for _you_ to try out this wonderful plugin. Simply install, create a gate and feel the funny tickle inside your brain while traveling.*
+
+The key features of this are:
+
+* Gates with and without frames
+* Gates consisting of portal blocks and gates made of air (so called hidden gates)
+* Gates with destinations in different worlds
+* Gates with custom shapes (gates can look any way you want)
 
 
-## FAQ
+*The Craft Inc. Corporation won't take any responsibility for seasickness, memory loss and sudden suffocation in walls while traveling with one of our gates!
+
+## FAQ ##
 
 __Who can create a gate?__
 
-See the _Permissions_ section.
+Have a look at the [_Permissions_](http://dev.bukkit.org/bukkit-plugins/craftinc-gates/pages/permissions/) page.
 
 __Who can destroy a gate?__
 
 Anyone if you do not use a third-party protection plugin like Grief Prevention.
 
-__Are there IConnomy integration, Features for user to dial other gates etc?__
+__Is there a IConnomy integration? Features for user to dial other gates etc?__
 
-Nope. This plugin is very minimalistic and plain. Server operators manage the portals players use them any time they are open.
+Nope. We currently don't plan to integrate such features. If you really need such an integration please inform us. If there are a lot of people requesting such features we might change our mind.
 
-## Permissions
+__Is there a list of all commands?__
 
- __craftincgates.info__
+Sure, type _/gate help_ in-game or have a look at the [_Commands_](http://dev.bukkit.org/bukkit-plugins/craftinc-gates/pages/commands/) page.
 
- Gives access to info and list commands.
+__When I destroy the frame of a gate it stops working. Shouldn't it still work?__
 
-  __craftincgates.use__
+Yes and no. To make gates work without a frame you need to tweak the _checkForBrokenGateFrames_ setting. Have a look at the [_Configuration_](http://dev.bukkit.org/bukkit-plugins/craftinc-gates/pages/configuration/) page for more information.
 
- Allows you to travel via gates.
 
-  __craftincgates.manage__
+## Usage ##
+With this plugin you can create gates which will teleport players anywhere you want. The gates can look any way you like.
 
- Gives access to commands manipulating gates.
+To make the gate work place yourself inside a newly created gate frame and type __/gate new [id]__. Afterwards walk to the destination of your gate and type __/gate exit [id]__ to set the destination. With __/gate open [id]__ you can get your newly created gate to work.
 
-## Installing
+To hide a gate simply call __/gate hide [id]__. Now that gate won’t be made of purple portal blocks while open.
 
-1. Download the latest release: __[https://github.com/tomco/minecraft-craftinc-gates/downloads](https://github.com/tomco/minecraft-craftinc-gates/downloads)__
+Have a look at the [_Commands_](http://dev.bukkit.org/bukkit-plugins/craftinc-gates/pages/commands/) page to find out how to modify gates even further.
-2. Put AncientGates.jar in the plugins folder.
 
-## License
 
-This project has a LGPL license just like the Bukkit project.
+## Installing ##
+
+1. Download the latest release _[here](http://dev.bukkit.org/bukkit-plugins/craftinc-gates/files/)_
+2. Extract the content of the zip file into the plugins folder of your Bukkit server.
+3. Start or reload the server.
+
+## Craft Inc. ##
+Check out our __[Craft Inc. Minecraft Server](http://www.craftinc.de)__. Everyone is welcome!
+
+Also check out our other great plugins:
+
+* [__Craft Inc. BorderProtection__](http://dev.bukkit.org/bukkit-mods/craftinc-borderprotection/)
+protect your worlds with a border players cannot cross.
+
+*  [__Craft Inc. Replicator__](http://dev.bukkit.org/bukkit-mods/craftinc-replicator/) 
+allows players to build a replicator to replicate blocks and other items. (still experimental)
+
+* __Craft Inc. Scarecrow__
+coming soon!
+
+## Roadmap ##
+* __Version 2.3__
+	* Info-Tools for gates. (Get the name of a gate you standing next to.)
+	* Search command for nearby gates. (Visually highlight nearby gates. Especially useful for hidden gates!)
+* __Future__
+	* Optionally allow animals and mobs to travel via gates.
+	* Allow players to use gates while sitting inside a minecart or boat
+	* Dynmap integration.
+	* Per player permissions for using and managing gates.
+	* Horizontal gates.
+
+## Bugs and other Problems ##
+Please use our [_issue tracker_](https://github.com/craftinc/craftinc-gates/issues?state=open) on GitHub.
+
+## Legal Information ##
+This project is a fork of the original [_Ancient Gates_](https://github.com/bladedpenguin/minecraft-ancient-gates). It is licensed under the [_LGPL_](http://www.gnu.org/licenses/lgpl-3.0.txt) just like the Bukkit project. Thanks to all current and previous [_contributors_](https://github.com/craftinc/craftinc-gates/blob/development/AUTHORS.txt).
+The font used for the Craft Inc. Gates logo is called [_MineCrafter 3_](http://www.minecraftforum.net/topic/892789-minecrafter-3-font-simply-easy/) and has been made available under the creative commons license. Thanks to Asherz08, MadPixel and Ashley Denham for this great font.

changelog.md

@@ -0,0 +1,36 @@
+## 2.2.0 ##
+* Improved gate commands and shortcuts (have a look at the bukkit-dev page for more information).
+* Improved overall performance.
+* Added a configuration file (have a look at the bukkit-dev page for more information).
+* Resolved issues with (random) teleports to the nether.
+* Made it possible to create non hidden gates without a frame. (Turned off by default!)
+* Changed the behavior regarding portal blocks. Starting with this version no blocks will be set by the plugin. All portal blocks will only be visible on client side.
+* Added checks preventing the plugin from overwriting the gate storage file on error.
+* Added the ability to change and disable messages on teleport and insufficient permissions via a config file.
+
+## 2.1.2 ##
+* Fixed a bug where players got teleported one block beside the real portal.
+* Fixed a bug where gates with no location caused multiple exceptions.
+
+## 2.1.1 ##
+* Made the list command more reliable.
+* Error messages will be displayed less frequent.
+
+## 2.1.0 ##
+* Command outputs are now colored.
+* Fixed a bug where players in creative mode would not be teleported correctly.
+* Made various commands available via the server console.
+* Simplified command names.
+* Improved permissions handling. (Added soft dependency for Vault.)
+* A message will be displayed after a player has been teleported. There is also a message displayed if a player is not allowed to use a gate.
+
+## 2.0.1a
+* Fixed broken import for gates created with version 2.0.0
+
+## 2.0.1
+* Updated permissions to allow everyone to use gates by default.
+* Fixed a bug where yaw had not been taken correctly into account while teleporting.
+* Re-added persistence of yaw and pitch of gate locations and exits.
+
+## 2.0.0
+Initial release under new name

doc/Commands.md

@@ -0,0 +1,35 @@
+* __/gate close, c [id]__
+Closes a gate to prevent players from using it.
+
+* __/gate delete, del, remove [id]__
+Removes the gate from the game.
+
+* __/gate exit, e [id]__
+Changes the location where the gate will teleport players to your current location.
+
+* __/gate help, ? [page]__ 
+Prints help pages.
+
+* __/gate hide, h [id]__
+Makes a gate NOT consist of gate blocks while open.
+
+* __/gate info, i [id]__
+Prints details about a certain gate.
+
+* __/gate list, ls [page]__
+Prints all available gates.
+
+* __/gate location, lo [id]__
+Sets the entrance of the gate to your current location.
+
+* __/gate new, n [id]__
+Creates a gate at your current location.
+
+* __/gate open, o [id]__
+ Open a gate so players can use it.
+
+* __/gate rename, rn [current name] [new name]__
+Changes the name/id of the gate.
+
+* __/gate unhide,uh [id]__
+ Makes that gate visible.

doc/Configuration.md

@@ -0,0 +1,51 @@
+Starting with version 2.2.0 some features are customizable via a configuration file.
+
+The configuration file will be automatically created on the the first startup after 
+installing or updating the plugin.
+
+
+The following keys and values are available:
+
+
+* __maxGateBlocks__
+A positive integer defining the maximum number of blocks a gate can consist of.
+Note that increasing this value might slow down your server!
+
+
+* __playerGateBlockUpdateRadius__
+Defines the radius around a player where portal blocks are visible to that player. 
+Adjust this value when increasing or decreasing the view-distance on the server. 
+Only positive integer values are allowed.
+
+
+* __checkForBrokenGateFrames__
+Allowed values are _true_ and _false_ only. Setting this value to _false_ will disable 
+all checks for broken frames for non-hidden gates. Disabling frame block checks 
+might increase you server performance.
+
+
+* __saveOnChanges__
+Allowed values are _true_ and _false_ only. Disabling _save on changes_ might
+increase server performance but gates will only be saved to disk when the plugin
+gets disabled! This might lead to data loss on error.
+
+
+* __gateTeleportMessage__
+A string value going to displayed every time when a player travels using a gate. Will 
+only be displayed if _showTeleportMessage_ is set to _true_.
+
+
+* __showTeleportMessage__
+A boolean (_true_ or _false_) determining wether the _teleport message_ will 
+be displayed.
+
+
+* __gateTeleportNoPermissionMessage__
+A string value going to displayed every time when a player enters a gate and is not 
+allowed to use that gate. Will only be displayed if _showTeleportNoPermissionMessage_
+is set to _true_.
+
+
+* __showTeleportNoPermissionMessage__
+A boolean (_true_ or _false_) determining wether the _no permission message_ will 
+be displayed.

doc/Permissions.md

@@ -0,0 +1,12 @@
+The following permissions are available: (Also have a look at the [Commands Page](http://dev.bukkit.org/bukkit-plugins/craftinc-gates/pages/commands/) to see if which commands can be executed with which permission set.)
+
+* __craftincgates.info__
+Gives access to info and list commands.
+
+* __craftincgates.use__
+Allows you to travel via gates.
+
+* __craftincgates.manage__
+Gives access to commands manipulating gates.
+
+Craft Inc. Gates will use __[Vault](http://dev.bukkit.org/bukkit-mods/vault/)__'s permission system if Vault is installed on your server.

plugin.yml

@@ -1,9 +1,10 @@
-name: Craft Inc. Gates
+name: ${project.name}
-version: 2.0.0
+version: ${project.version}
 description: A plugin to create gates for fast traveling.
-author: tomco,  s1m0ne
+softdepend: [Vault]
+author: tomco, s1m0ne
 authors: [oloflarsson, locutus, DrAgonmoray, s1m0ne, tomco]
-website: http://www.craftinc.de/craftinc-gates/
+website: http://dev.bukkit.org/bukkit-plugins/craftinc-gates/
 
 main: de.craftinc.gates.Plugin
 database: false
@@ -23,6 +24,7 @@ permissions:
   craftincgates.info:
     description: Gives access to info and list commands.
   craftincgates.use:
+    default: true
     description: Allows you to use open gates.
   craftincgates.manage:
     description: Gives access to commands manipulating gates.

pom.xml

@@ -4,39 +4,90 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.craftinc</groupId>
     <artifactId>CraftIncGates</artifactId>
+    <name>Craft Inc. Gates</name>
     <packaging>jar</packaging>
-    <version>1.1.1</version>
+    <version>2.2.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <build>
+        <finalName>${project.name} ${project.version}</finalName>
+        <sourceDirectory>src</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>Run Test Bukkit Server</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>${basedir}/scripts/test-deployment.sh</executable>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>RELEASE</version>
+            <version>1.5.2-R1.0</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.5.2-R1.0</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.milkbowl.vault</groupId>
+            <artifactId>Vault</artifactId>
+            <version>1.2.26-SNAPSHOT</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <directory>target</directory>
-        <outputDirectory>target/classes</outputDirectory>
-        <finalName>${project.artifactId}</finalName>
-        <sourceDirectory>src</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>src/resources</directory>
-            </resource>
-        </resources>
-    </build>
-
     <repositories>
         <repository>
             <id>bukkit-repo</id>
             <url>http://repo.bukkit.org/content/groups/public</url>
         </repository>
+        <repository>
+            <id>vault-repo</id>
+            <url>http://ci.herocraftonline.com/plugin/repository/everything</url>
+        </repository>
     </repositories>
 </project>

resources/config.yml

@@ -0,0 +1,8 @@
+maxGateBlocks: 50
+playerGateBlockUpdateRadius: 64
+saveOnChanges: true
+checkForBrokenGateFrames: true
+gateTeleportMessage: "Thank you for traveling with Craft Inc. Gates."
+showTeleportMessage: true
+gateTeleportNoPermissionMessage: "You are not allowed to use this gate!"
+showTeleportNoPermissionMessage: true

resources/plugin.yml

@@ -0,0 +1 @@
+../plugin.yml

scripts/minecraft.sh

@@ -0,0 +1,160 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(dirname "$0")
+SERVICE='craftbukkit*.jar'
+#USERNAME="minecraft"
+CPU_COUNT=2
+BUKKIT="$SCRIPT_DIR/../target/lib/$SERVICE"
+INVOCATION="java -Xmx1000M -Xms300M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:ParallelGCThreads=$CPU_COUNT -XX:+AggressiveOpts -jar $BUKKIT nogui"
+MCPATH="$SCRIPT_DIR/../bukkit-testserver"
+
+if [ ! -d "$MCPATH" ]; then
+    mkdir -p "$MCPATH"
+fi
+
+ME=$(whoami)
+as_user() {
+    #if [ $ME == $USERNAME ] ; then
+        bash -c "$1"
+    #else
+        #su - $USERNAME -c "$1"
+    #fi
+}
+
+mc_start() {
+    if ps ax | grep -v grep | grep -v -i SCREEN | grep "craftbukkit" > /dev/null
+    then
+        echo "Tried to start but $SERVICE was already running!"
+    else
+        echo "$SERVICE was not running... starting."
+        cd "$MCPATH"
+        as_user "cd "$MCPATH" && screen -dmS minecraft $INVOCATION"
+        sleep 7
+        if ps ax | grep -v grep | grep -v -i SCREEN | grep "craftbukkit" > /dev/null
+        then
+            echo "$SERVICE is now running."
+        else
+            echo "Could not start $SERVICE."
+        fi
+    fi
+}
+
+mc_stop() {
+    if ps ax | grep -v grep | grep -v -i SCREEN | grep "craftbukkit" > /dev/null
+    then
+        echo "$SERVICE is running... stopping."
+        as_user "screen -p 0 -S minecraft -X eval 'stuff \"save-all\"\015'"
+        sleep 2
+        as_user "screen -p 0 -S minecraft -X eval 'stuff \"stop\"\015'"
+        sleep 6
+    else
+        echo "$SERVICE was not running."
+    fi
+    if ps ax | grep -v grep | grep -v -i SCREEN | grep "craftbukkit" > /dev/null
+    then
+        echo "$SERVICE could not be shut down... still running."
+    else
+        echo "$SERVICE is shut down."
+    fi
+}
+
+mc_save() {
+    if ps ax | grep -v grep | grep -v -i SCREEN | grep "craftbukkit" > /dev/null
+    then
+        echo "$SERVICE is running... saving."
+        as_user "screen -p 0 -S minecraft -X eval 'stuff \"save-all\"\015'"
+    else
+        echo "$SERVICE was not running."
+    fi
+}
+
+mc_reload() {
+    if ps ax | grep -v grep | grep -v -i SCREEN | grep "craftbukkit" > /dev/null
+    then
+        echo "$SERVICE is running... reloading."
+        as_user "screen -p 0 -S minecraft -X eval 'stuff \"reload\"\015'"
+    else
+        echo "$SERVICE was not running."
+    fi
+}
+
+mc_reload_or_start() {
+    if ps ax | grep -v grep | grep -v -i SCREEN | grep "craftbukkit" > /dev/null
+    then
+        echo "$SERVICE was already running! Doing a reload now!"
+        mc_reload
+    else
+        echo "$SERVICE was not running... starting."
+        cd "$MCPATH"
+        as_user "cd \"$MCPATH\" && screen -dmS minecraft $INVOCATION"
+        sleep 7
+        if ps ax | grep -v grep | grep -v -i SCREEN | grep "craftbukkit" > /dev/null
+        then
+            echo "$SERVICE is now running."
+        else
+            echo "Could not start $SERVICE."
+        fi
+    fi
+}
+
+mc_ddidderr_admin() {
+    if ps ax | grep -v grep | grep -v -i SCREEN | grep "craftbukkit" > /dev/null
+    then
+        echo "$SERVICE is running... making ddidder to admin and reloading permissions."
+        as_user "screen -p 0 -S minecraft -X eval 'stuff \"pex user ddidderr group set admin\"\015'"
+        as_user "screen -p 0 -S minecraft -X eval 'stuff \"pex reload\"\015'"
+    else
+        echo "$SERVICE was not running."
+    fi
+}
+
+case "$1" in
+    start)
+        echo "Starting Minecraft..."
+        mc_start
+        echo "DONE"
+        ;;
+    stop)
+        echo "Stopping Minecraft..."
+        as_user "screen -p 0 -S minecraft -X eval 'stuff \"say SERVER SHUTTING DOWN!\"\015'"
+        mc_stop
+        echo "DONE"
+        ;;
+    restart)
+        as_user "screen -p 0 -S minecraft -X eval 'stuff \"say SERVER REBOOT IN 10 SECONDS.\"\015'"
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+    reload)
+        mc_reload
+        ;;
+    reload_or_start)
+        echo "Starting or reloading Minecraft..."
+        mc_reload_or_start
+        echo "DONE"
+        ;;
+    ddidderr_admin)
+        mc_ddidderr_admin
+        ;;
+    connected)
+        as_user "screen -p 0 -S minecraft -X eval 'stuff \"who\"\015'"
+        sleep 2s
+        tac "$MCPATH"/server.log | grep -m 1 "Connected"
+        ;;
+    status)
+        if ps ax | grep -v grep | grep -v -i SCREEN | grep "craftbukkit" > /dev/null
+        then
+            echo "$SERVICE is running."
+        else
+            echo "$SERVICE is not running."
+        fi
+        ;;
+    save)
+        mc_save
+        ;;
+    *)
+        echo "Usage: /etc/init.d/minecraft {start|stop|restart|connected|status}"
+        exit 1
+        ;;
+esac

scripts/test-deployment.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+SCRIPT_DIR="$(dirname "$0")"
+
+DEVELOPER=$(whoami)
+
+if [ $DEVELOPER = "tobi" ]; then
+	BUKKIT_DIR="$HOME/minecraft/testbuk"
+	PLUGIN_DIR="$HOME/minecraft/testbuk/plugins"
+	START_STOP_SCRIPT="$BUKKIT_DIR/../minecraft.sh"
+else
+	BUKKIT_DIR="$SCRIPT_DIR/../bukkit-testserver"
+	PLUGIN_DIR="$SCRIPT_DIR/../bukkit-testserver/plugins"
+	START_STOP_SCRIPT="$SCRIPT_DIR/minecraft.sh"
+fi
+
+# TODO: This is a bad solution! Maven should write necessary information into an extra file.
+ARTIFACT_ID="$(grep -C5 '<groupId>de.craftinc' "$SCRIPT_DIR/../pom.xml" | grep '<name>' | sed 's/[ \t]*<name>//g' | sed 's/<\/name>[ \t]*//g')"
+
+# TODO: This is a bad solution! Maven should write necessary information into an extra file.
+VERSION="$(grep -C5 '<groupId>de.craftinc' "$SCRIPT_DIR/../pom.xml" | grep '<version>' | sed 's/[ \t]*<version>//g' | sed 's/<\/version>[ \t]*//g')"
+
+mkdir -p "$PLUGIN_DIR"
+
+cp "$SCRIPT_DIR/../target/$ARTIFACT_ID $VERSION".jar "$PLUGIN_DIR/"
+
+echo -e "ddidderr\nmice_on_drugs\nMochaccino\nbeuth_el_max" > "$BUKKIT_DIR/ops.txt"
+
+$START_STOP_SCRIPT reload_or_start

src/de/craftinc/gates/BaseGate.java

@@ -1,195 +0,0 @@
-package de.craftinc.gates;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-
-import de.craftinc.gates.util.FloodUtil;
-
-
-public abstract class BaseGate
-{
-	/*
-	 * ATTRIBUTES
-	 */
-	protected Location location; /* saving both location and gateBlockLocations is redundant but makes it easy to allow players to reshape gates */
-	protected Set<Location> gateBlockLocations = new HashSet<Location>(); /* Locations of the blocks inside the gate */
-	
-	protected Location exit;
-	
-	protected boolean isHidden = false;
-	protected boolean isOpen = false;
-	
-	
-	/*
-	 * SETTER & GETTER
-	 */	
-	
-	public Location getLocation() 
-	{
-		return location;
-	}
-	
-	
-	public void setLocation(Location location)  throws Exception
-	{
-		this.location = location;
-		
-		if (isOpen) {
-			fillGate();
-			validate();
-		}
-	}
-	
-	
-	public Location getExit() 
-	{
-		return exit;
-	}
-	
-	
-	public void setExit(Location exit)  throws Exception
-	{
-		this.exit = exit;
-		validate();
-	}
-	
-	
-	public boolean isHidden() 
-	{
-		return isHidden;
-	}
-	
-	
-	public void setHidden(boolean isHidden) throws Exception
-	{
-		this.isHidden = isHidden;
-		
-		if (isHidden == true) {
-			emptyGate();
-		}
-		else if (isOpen()) {
-			fillGate();
-		}
-		
-		validate();
-	}
-	
-	
-	public boolean isOpen() 
-	{
-		return isOpen;
-	}
-	
-	
-	public void setOpen(boolean isOpen) throws Exception
-	{
-		if (isOpen == true && this.isOpen == false) {
-			findPortalBlocks();
-			
-			if (!isHidden) {
-				fillGate();
-			}
-		}
-		else if (isOpen == false && this.isOpen == true) {
-			emptyGate();
-		}
-		
-		this.isOpen = isOpen;
-		
-		validate();
-	}
-	
-	
-	public Set<Location> getGateBlockLocations() 
-	{
-		return gateBlockLocations;
-	}
-	
-	
-	/*
-	 * GATE BLOCK HANDLING
-	 */
-	
-	protected void fillGate()
-	{	
-		emptyGate();
-		findPortalBlocks();
-		
-		// This is not to do an effect
-		// It is to stop portal blocks from destroying themself as they cant rely on non created blocks :P
-		for (Location l : gateBlockLocations) {
-			l.getBlock().setType(Material.GLOWSTONE);
-		}
-		
-		for (Location l : gateBlockLocations) {
-			l.getBlock().setType(Material.PORTAL);
-		}
-	}
-	
-	
-	protected void emptyGate()
-	{
-		for (Location l : gateBlockLocations) {
-			if (l.getBlock().getType() == Material.PORTAL) {
-				l.getBlock().setType(Material.AIR);
-			}
-		}
-	}
-	
-	
-	protected void findPortalBlocks() 
-	{
-		gateBlockLocations = new HashSet<Location>();
-		Set<Block> gateBlocks = FloodUtil.getGateFrameBlocks(location.getBlock());
-		
-		if (gateBlocks != null) {
-			for (Block b : gateBlocks) {
-				gateBlockLocations.add(b.getLocation());
-			}
-		}
-	}
-	
-	
-	/*
-	 * VALIDATION
-	 */
-	
-	/**
-	 * Checks if valus attributes do add up; will close gate on wrong values.
-	 */
-	public void validate() throws Exception
-	{
-		if (!isOpen) {
-			return;
-		}
-		
-		if (location == null) {
-			setOpen(false);
-			throw new Exception("Gate got closed. It has no location.");
-		}
-		
-		if (exit == null) {
-			setOpen(false);
-			throw new Exception("Gate got closed. It has no exit.");
-		}
-		
-		if (gateBlockLocations.size() == 0) {
-			setOpen(false);
-			throw new Exception("Gate got closed. The frame is missing or broken.");
-		}
-		
-		
-		if (isHidden == false) {			
-			for (Location l : gateBlockLocations) {
-				if (l.getBlock().getType() == Material.AIR) {
-					setOpen(false);
-					throw new Exception("Gate got closed. The frame is missing or broken.");
-				}
-			}
-		}	
-	}
-}

src/de/craftinc/gates/Gate.java

@@ -1,183 +1,350 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates;
 
-import java.util.ArrayList;
+import de.craftinc.gates.util.FloodUtil;
-import java.util.Collection;
+import de.craftinc.gates.persistence.LocationUtil;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
 import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 
-import de.craftinc.gates.util.LocationSerializer;
+import java.util.*;
 
 
-
+public class Gate implements ConfigurationSerializable
-/**
- * Adds persistence and serialization to the base gate class.
- */
-public class Gate extends BaseGate implements ConfigurationSerializable
 {
-	/*
+	protected Location location; /* saving both location and gateBlockLocations is redundant but makes it easy to allow players to reshape gates */
-	 * ATTRIBUTES
+	protected Set<Location> gateBlockLocations = new HashSet<Location>(); /* Locations of the blocks inside the gate */
-	 */
+    protected Set<Block> gateFrameBlocks = new HashSet<Block>();
+	
+	protected Location exit;
+	
+	protected boolean isHidden = false;
+	protected boolean isOpen = false;
 	
 	protected String id;
 
-	protected static Map<String, Gate> instances = new HashMap<String, Gate>();	
+    /**
-	
+     * You should never create two gates with the same 'id'. Also see 'setId(String id)'.
-	/*
+     * @param id This parameter must not be 'null'. An exception will be thrown otherwise!
-	 * CONSTRUCTORS
+     */
-	 */
+	public Gate(final String id)
-	
-	public Gate(String id) throws Exception
 	{
-		setId(id);
+        setId(id);
 	}
 	
 	
-	/*
+	public String toString()
-	 * SETTER & GETTER
-	 */
-	
-	public String getId() 
 	{
+		return super.toString() + " " + this.getId();
+	}
+
+
+    /**
+     *
+     * @return This method might return a 'null' value.
+     */
+	public Location getLocation() 
+	{
+		return location;
+	}
+
+
+    /**
+     *
+     * @param location Supplying 'null' is permitted.
+     * @throws Exception Will throw an exception if the gate is open and an invalid (no gate frame) location is
+     *         supplied. Note that the supplied 'location' will be set even if an exception is thrown. Note that this
+     *         gate will be closed if an exception is thrown.
+     */
+	public void setLocation(final Location location) throws Exception
+	{
+		this.location = location;
+		
+		if (isOpen) {
+            findPortalBlocks();
+			validate();
+		}
+        else {
+            this.gateBlockLocations = new HashSet<Location>();
+            this.gateFrameBlocks = new HashSet<Block>();
+        }
+	}
+
+
+    /**
+     *
+     * @return This method might return a 'null' value.
+     */
+	public Location getExit() 
+	{
+		return exit;
+	}
+
+
+    /**
+     *
+     * @param exit Supplying 'null' is permitted.
+     * @throws Exception An exception will be thrown if 'null' value is supplied and this gate is open. Note that the
+     *         supplied 'exit' will be set even if an exception is thrown. Note that this gate will be closed if an
+     *         exception is thrown.
+     */
+	public void setExit(final Location exit) throws Exception
+	{
+		this.exit = exit;
+		validate();
+	}
+
+
+    /**
+     *
+     * @return This method will never return 'null'.
+     */
+	public String getId()
+    {
 		return id;
 	}
 
 
+    /**
+     * Every gate should have an unique 'id'. You should therefore check if another gate with the same 'id' exists.
+     * Note that this method will not check if another gate with the same 'id' exists!
+     * @param id This parameter must not be 'null'. An exception will be thrown otherwise!
+     */
+	public void setId(final String id)
+    {
+        if (id == null) {
+            throw new IllegalArgumentException("gate 'id' cannot be 'null'");
+        }
 
-	public void setId(String id) throws Exception
+		this.id = id.toLowerCase();
+	}
+
+
+	public boolean isHidden() 
 	{
-		if (exists(id)) {
+		return isHidden;
-			throw new Exception("A gate with '" + id + "' already exists");
+	}
+	
+	
+	public void setHidden(boolean isHidden) throws Exception
+	{
+		this.isHidden = isHidden;
+        this.validate();
+	}
+	
+	
+	public boolean isOpen() 
+	{
+		return isOpen;
+	}
+	
+	
+	public void setOpen(boolean isOpen) throws Exception
+	{
+		if (isOpen && !this.isOpen) {
+            findPortalBlocks();
 		}
 
-		this.id = id;
+		this.isOpen = isOpen;
+		validate();
+	}
+
+
+    /**
+     *
+     * @return Will never return 'null' but might return an empty Set.
+     */
+	public Set<Location> getGateBlockLocations() 
+	{
+		return gateBlockLocations;
+	}
+
+
+    /**
+     *
+     * @return Will never return 'null' but might return an empty Set.
+     */
+    public Set<Block> getGateFrameBlocks()
+    {
+        return gateFrameBlocks;
+    }
+
+
+
+	protected void findPortalBlocks()
+	{
+		gateBlockLocations = new HashSet<Location>();
+		Set<Block> gateBlocks = FloodUtil.getGatePortalBlocks(location.getBlock());
+
+		if (gateBlocks != null) {
+			for (Block b : gateBlocks) {
+				gateBlockLocations.add(b.getLocation());
+			}
+		}
+
+        gateFrameBlocks = FloodUtil.getFrame(gateBlocks);
+	}
+
+
+	/**
+	 * Checks if values attributes do add up; will close gate on wrong values.
+	 */
+	public void validate() throws Exception
+	{
+		if (!isOpen) {
+			return;
+		}
+		
+		if (location == null) {
+			isOpen = false;
+            this.gateBlockLocations = new HashSet<Location>();
+            this.gateFrameBlocks = new HashSet<Block>();
+
+			throw new Exception("Gate got closed. It has no location.");
+		}
+		
+		if (exit == null) {
+            isOpen = false;
+            this.gateBlockLocations = new HashSet<Location>();
+            this.gateFrameBlocks = new HashSet<Block>();
+
+			throw new Exception("Gate got closed. It has no exit.");
+		}
+		
+		if (gateBlockLocations.size() == 0) {
+            isOpen = false;
+            this.gateBlockLocations = new HashSet<Location>();
+            this.gateFrameBlocks = new HashSet<Block>();
+
+			throw new Exception("Gate got closed. The frame is missing or broken. (no gate blocks)");
+		}
+
+        if (!isHidden() && Plugin.getPlugin().getConfig().getBoolean(Plugin.confCheckForBrokenGateFramesKey)) {
+
+            for (Block b : gateFrameBlocks) {
+
+                if (b.getType() == Material.AIR) {
+                    isOpen = false;
+                    this.gateBlockLocations = new HashSet<Location>();
+                    this.gateFrameBlocks = new HashSet<Block>();
+
+                    throw new Exception("Gate got closed. The frame is missing or broken. (missing frame block(s))");
+                }
+            }
+        }
 	}
 
 
 	/*
 	 * INTERFACE: ConfigurationSerializable
 	 */
-	static String idKey = "id";
+	static protected String idKey = "id";
-	static String locationKey = "location";
+	static protected String locationKey = "location";
-	static String gateBlocksKey = "gateBlocks";
+	static protected String gateBlocksKey = "gateBlocks";
-	static String exitKey = "exit";
+	static protected String exitKey = "exit";
-	static String isHiddenKey = "hidden";
+	static protected String isHiddenKey = "hidden";
-	static String isOpenKey = "open";
+	static protected String isOpenKey = "open";
+	static protected String locationYawKey = "locationYaw";
+	static protected String locationPitchKey = "locationPitch";
+	static protected String exitYawKey = "exitYaw";
+	static protected String exitPitchKey = "exitPitch";
 	
 	
 	@SuppressWarnings("unchecked")
-	public Gate(Map<String, Object> map) 
+    public Gate(Map<String, Object> map)
 	{
-		try {
+        try {
-			id = map.get(idKey).toString();
+			id = map.get(idKey).toString().toLowerCase();
+
+            if (id == null) {
+                throw new Exception("gates need to have an id");
+            }
+
 			isHidden = (Boolean)map.get(isHiddenKey);
 			isOpen = (Boolean)map.get(isOpenKey);
 			
-			location = LocationSerializer.deserializeLocation((Map<String, Object>) map.get(locationKey));
+			location = LocationUtil.deserializeLocation((Map<String, Object>) map.get(locationKey));
-			exit = LocationSerializer.deserializeLocation((Map<String, Object>) map.get(exitKey));
+			exit = LocationUtil.deserializeLocation((Map<String, Object>) map.get(exitKey));
+			
+			if (map.containsKey(exitPitchKey)) {
+				exit.setPitch(((Number)map.get(exitPitchKey)).floatValue());
+				exit.setYaw(((Number)map.get(exitYawKey)).floatValue());
+			}
+			
+			if (map.containsKey(locationPitchKey)) {
+				location.setPitch(((Number)map.get(locationPitchKey)).floatValue());
+				location.setYaw(((Number)map.get(locationYawKey)).floatValue());
+			}
 			
 			gateBlockLocations = new HashSet<Location>();
 			List<Map<String, Object>> serializedGateBlocks = (List<Map<String, Object>>)map.get(gateBlocksKey);
 			
 			for (Map<String, Object> sgb : serializedGateBlocks) {
-				gateBlockLocations.add(LocationSerializer.deserializeLocation(sgb));
+				gateBlockLocations.add(LocationUtil.deserializeLocation(sgb));
 			}
+
+            gateFrameBlocks = FloodUtil.getFrameWithLocations(gateBlockLocations);
 		}
 		catch (Exception e) {
 			Plugin.log("ERROR: Failed to load gate '" + id + "'! (" + e.getMessage() + ")");
 			Plugin.log("NOTE:  This gate will be removed from 'gates.yml' and added to 'invalid_gates.yml'!");
 			
-			Plugin.instance.storeInvalidGate(map);
+			Plugin.getPlugin().getGatesManager().storeInvalidGate(map);
-
-			return;
 		}
 
-		instances.put(id, this);
+        try {
+            validate(); // make sure to not write invalid stuff to disk
+        }
+        catch (Exception e) {
+            Plugin.log("The loaded gate " + this.getId() + " seems to be not valid: " + e.getMessage());
+        }
 	}
 	
 	
 	public Map<String, Object> serialize() 
 	{
-		try {
-			validate(); // make sure to not write invalid stuff to disk
-		} 
-		catch (Exception e) {
-		}
-		
 		Map<String, Object> retVal = new HashMap<String, Object>();
 		
 		retVal.put(idKey, id);
-		retVal.put(locationKey, LocationSerializer.serializeLocation(location));
+		retVal.put(locationKey, LocationUtil.serializeLocation(location));		
-		retVal.put(exitKey, LocationSerializer.serializeLocation(exit));
+		retVal.put(exitKey, LocationUtil.serializeLocation(exit));
 		retVal.put(isHiddenKey, isHidden);
 		retVal.put(isOpenKey, isOpen);
 		
+		if (exit != null) {
+			retVal.put(exitPitchKey, exit.getPitch());
+			retVal.put(exitYawKey, exit.getYaw());
+		}
+		
+		if (location != null) {
+			retVal.put(locationPitchKey, location.getPitch());
+			retVal.put(locationYawKey, location.getYaw());
+		}
+		
 		List<Map<String, Object>> serializedGateBlocks = new ArrayList<Map<String, Object>>();
 		
 		for (Location l : gateBlockLocations) {
-			serializedGateBlocks.add(LocationSerializer.serializeLocation(l));
+			serializedGateBlocks.add(LocationUtil.serializeLocation(l));
 		}
 		
 		retVal.put(gateBlocksKey, serializedGateBlocks);
 		
 		return retVal;
 	}
-
-
-	/*
-	 * ENTITY MANAGEMENT
-	 */
-	
-	public static Gate get(String id) 
-	{
-		return instances.get(id);
-	}
-	
-	
-	public static boolean exists(String id) 
-	{
-		return instances.containsKey(id);
-	}
-	
-	
-	public static Gate create(String id) throws Exception
-	{
-		Gate gate = new Gate(id);
-		
-		instances.put(gate.id, gate);
-		return gate;
-	}
-	
-	
-	public static void rename(String oldId, String newId) throws Exception
-	{
-		Gate gate = get(oldId);
-		
-		gate.setId(newId);
-		
-		delete(oldId);
-		instances.put(gate.id, gate);
-	}
-	
-	
-	public static void delete(String id) 
-	{
-		Gate g = get(id);
-		
-		if (g != null) {
-			g.emptyGate();
-		}
-		
-		instances.remove(id);
-	}
-	
-	
-	public static Collection<Gate> getAll() 
-	{
-		return instances.values();
-	}
 }

src/de/craftinc/gates/GatesManager.java

@@ -0,0 +1,513 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import java.util.*;
+import java.util.logging.Level;
+
+import de.craftinc.gates.persistence.MigrationUtil;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import de.craftinc.gates.util.SimpleChunk;
+import de.craftinc.gates.util.SimpleLocation;
+
+
+public class GatesManager 
+{
+    protected File gatesConfigFile;
+    protected FileConfiguration gatesConfig;
+    protected static final String gatesPath = "gates"; // path to gates inside the yaml file
+    protected static final String storageVersionPath = "version";
+    protected static final int storageVersion = 1;
+
+    protected int chunkRadius;
+
+    protected Map<String, Gate> gatesById;
+    protected Map<SimpleChunk, Set<Gate>> gatesByChunk;
+    protected Map<SimpleLocation, Gate> gatesByLocation;
+    protected Map<SimpleLocation, Gate> gatesByFrameLocation;
+
+    protected List<Gate> gates;
+
+    protected boolean storageFileIsInvalid = false;
+
+
+	public Gate getGateWithId(final String id)
+	{
+		return gatesById.get(id.toLowerCase());
+	}
+	
+	
+	public Set<Gate> getNearbyGates(final Chunk chunk)
+	{
+		SimpleChunk simpleChunk = new SimpleChunk(chunk);
+		return gatesByChunk.get(simpleChunk);
+	}
+	
+	
+	public Gate getGateAtLocation(final Location location)
+	{
+		SimpleLocation simpleLocation = new SimpleLocation(location);
+		return gatesByLocation.get(simpleLocation);
+	}
+
+
+    public Gate getGateAtFrameLocation(final Location location)
+    {
+        SimpleLocation simpleLocation = new SimpleLocation(location);
+        return gatesByFrameLocation.get(simpleLocation);
+    }
+
+	
+	public void saveGatesToDisk()
+	{
+		if (storageFileIsInvalid) {
+            Plugin.log(Level.SEVERE, "ERROR: Not saving gates to disk. Storage file is invalid or corrupted!");
+            return;
+        }
+
+        gatesConfig.set(gatesPath, gates);
+        gatesConfig.set(storageVersionPath, storageVersion);
+		
+		try {
+			gatesConfig.save(gatesConfigFile);
+			Plugin.log("Saved gates to disk.");
+		} 
+		catch (IOException e) {
+			Plugin.log(Level.SEVERE, "ERROR: Could not save gates to disk.");
+			e.printStackTrace();
+		}
+	}
+	
+	
+	@SuppressWarnings("unchecked")
+	public boolean loadGatesFromDisk()
+	{
+		this.gatesConfigFile = new File(Plugin.getPlugin().getDataFolder(), "gates.yml");
+		
+		if(!this.gatesConfigFile.exists()) {
+			try {
+                boolean isNew = this.gatesConfigFile.createNewFile();
+
+                if (isNew) {
+                    Plugin.log(Level.FINEST, "Created gate storage file.");
+                }
+            }
+            catch (IOException e) {
+                this.storageFileIsInvalid = true;
+				Plugin.log(Level.SEVERE, "Cannot create gate storage file! No gates will be persisted.");
+                return false;
+			}
+		}
+		
+		this.gatesConfig = new YamlConfiguration();
+
+        try {
+            this.gatesConfig.load(this.gatesConfigFile);
+        }
+        catch (Exception e) {
+            this.storageFileIsInvalid = true;
+            Plugin.log(Level.SEVERE, "Gate file on disk is invalid. No gates loaded. Plugin will be disabled! (" + Arrays.toString(e.getStackTrace()) + ")");
+            return false;
+        }
+
+		this.gates = (List<Gate>)gatesConfig.getList(gatesPath);
+
+        if (this.gates == null) {
+            this.gates = new ArrayList<Gate>();
+        }
+
+        for (Object o : this.gates) {
+			
+			if (!(o instanceof Gate)) {
+                this.storageFileIsInvalid = true;
+				Plugin.log(Level.SEVERE, "Gate file on disk is invalid. No gates loaded. Plugin will be disabled! (Invalid gate class detected)");
+                return false;
+        	}
+		}
+
+        for (Gate g : this.gates) {
+            try {
+                g.validate();
+            }
+            catch (Exception e) {
+                try {
+                    g.setOpen(false);
+                }
+                catch (Exception ignored) { }
+
+                Plugin.log(Level.FINER, "closed gate '" + g.getId() + "' reason: " + e.getMessage());
+            }
+        }
+
+		fillGatesById();
+		fillGatesByChunk();
+		fillGatesByLocation();
+        fillGatesByFrameLocation();
+
+        Plugin.log("Loaded " + this.gates.size() + " gates.");
+
+        // migration
+        int fileStorageVersion = gatesConfig.getInt(storageVersionPath);
+
+        if (fileStorageVersion > storageVersion) {
+            this.storageFileIsInvalid = true;
+            Plugin.log(Level.SEVERE, "Unsupported storage version detected! Make sure you have the latest version of Craft Inc. Gates installed. Plugin will be disabled!");
+            return false;
+        }
+
+        if (fileStorageVersion < storageVersion && !this.gates.isEmpty()) {
+            Plugin.log("Outdated storage version detected. Performing data migration...");
+            boolean success = MigrationUtil.performMigration(fileStorageVersion, storageVersion, this.gates);
+
+            this.storageFileIsInvalid = !success;
+            return success;
+        }
+
+        return true;
+	}
+
+
+    protected int getChunkRadius()
+    {
+        if (this.chunkRadius == 0) {
+            this.chunkRadius = Plugin.getPlugin().getConfig().getInt(Plugin.confPlayerGateBlockUpdateRadiusKey);
+            this.chunkRadius = this.chunkRadius >> 4;
+        }
+
+        return this.chunkRadius;
+    }
+
+
+    protected void fillGatesById()
+	{
+		gatesById = new HashMap<String, Gate>((int)(gates.size() * 1.25));
+		
+		for (Gate g : gates) {
+			this.addGateWithId(g);
+		}
+	}
+
+
+    protected void fillGatesByChunk()
+	{
+		HashSet<SimpleChunk> chunksUsedByGates = new HashSet<SimpleChunk>();
+		
+		for (Gate g : gates) {
+
+            if (g.getLocation() != null) {
+
+                Chunk c = g.getLocation().getChunk();
+
+                int x = c.getX();
+                int z = c.getZ();
+
+                for (int i = x-getChunkRadius(); i < x+getChunkRadius(); i++) {
+
+                    for (int j = z-getChunkRadius(); j < z+getChunkRadius(); j++) {
+
+                        chunksUsedByGates.add(new SimpleChunk(i, j, c.getWorld()));
+                    }
+                }
+            }
+		}
+		
+		gatesByChunk = new HashMap<SimpleChunk, Set<Gate>>((int)(chunksUsedByGates.size() * 1.25));
+		
+		for (Gate g : gates) {
+			this.addGateByChunk(g);
+		}
+	}
+
+
+    protected void fillGatesByLocation()
+	{
+		Set<Location> gateBlocks = new HashSet<Location>();
+		
+		for (Gate g : gates) {
+
+            for (Location l : g.getGateBlockLocations()) {
+                gateBlocks.add(l);
+
+                Location headLocation = new Location(l.getWorld(),
+                                                     l.getX(),
+                                                     l.getY()+1,
+                                                     l.getZ());
+
+                gateBlocks.add(headLocation);
+            }
+		}
+		
+		gatesByLocation = new HashMap<SimpleLocation, Gate>((int)(gateBlocks.size()*1.25));
+		
+		for (Gate g : gates) {
+			this.addGateByLocations(g);
+		}
+	}
+
+
+    protected void fillGatesByFrameLocation()
+    {
+        int numFrameBlocks = 0;
+
+        for (Gate g : gates) {
+            numFrameBlocks += g.gateFrameBlocks.size();
+        }
+
+        gatesByFrameLocation = new HashMap<SimpleLocation, Gate>((int)(numFrameBlocks*1.25));
+
+        for (Gate g : gates) {
+            this.addGateByFrameLocations(g);
+        }
+    }
+
+
+    protected void removeGateById(final String id)
+	{
+		gatesById.remove(id);
+	}
+
+
+    protected void addGateWithId(final Gate g)
+	{
+		gatesById.put(g.getId(), g);
+	}
+
+
+    protected void removeGateByLocation(final Set<Location> gateBlocks)
+	{
+		if (gateBlocks != null) {
+
+            for (Location l : gateBlocks) {
+
+                SimpleLocation sl = new SimpleLocation(l);
+                gatesByLocation.remove(sl);
+
+                SimpleLocation headLocation = new SimpleLocation(l, true);
+                gatesByLocation.remove(headLocation);
+            }
+        }
+	}
+
+
+    protected void removeGateByFrameLocation(final Set<Block> gateFrameBlocks)
+    {
+        if (gateFrameBlocks != null) {
+
+            for (Block block : gateFrameBlocks) {
+                SimpleLocation sl = new SimpleLocation(block.getLocation());
+                gatesByFrameLocation.remove(sl);
+            }
+        }
+    }
+
+
+    protected void addGateByLocations(final Gate g)
+	{
+        for (Location l : g.getGateBlockLocations()) {
+
+			SimpleLocation sl = new SimpleLocation(l);
+			gatesByLocation.put(sl, g);
+
+            SimpleLocation headLocation = new SimpleLocation(l, true);
+            gatesByLocation.put(headLocation, g);
+		}
+	}
+
+
+    protected void addGateByFrameLocations(final Gate g)
+    {
+        for (Block block : g.getGateFrameBlocks()) {
+            SimpleLocation sl = new SimpleLocation(block.getLocation());
+            gatesByFrameLocation.put(sl, g);
+        }
+    }
+
+
+    protected void removeGateFromChunk(final Gate g, final Location l)
+	{
+		if (l != null) {
+
+            Chunk c = l.getChunk();
+            int x = c.getX();
+            int z = c.getZ();
+
+            for (int i = x-getChunkRadius(); i < x+getChunkRadius(); i++) {
+
+                for (int j = z-getChunkRadius(); j < z+getChunkRadius(); j++) {
+
+                    SimpleChunk sc = new SimpleChunk(i, j, c.getWorld());
+		            Set<Gate> gatesInChunk = gatesByChunk.get(sc);
+
+                    if (gatesInChunk != null) {
+                        gatesInChunk.remove(g);
+                    }
+
+                }
+            }
+        }
+	}
+
+
+    protected void addGateByChunk(final Gate g)
+	{
+        Location gateLocation = g.getLocation();
+
+		if (gateLocation != null) {
+
+            Chunk c = g.getLocation().getChunk();
+            int x = c.getX();
+            int z = c.getZ();
+
+            for (int i = x-getChunkRadius(); i < x+getChunkRadius(); i++) {
+
+                for (int j = z-getChunkRadius(); j < z+getChunkRadius(); j++) {
+
+                    SimpleChunk sc = new SimpleChunk(i, j, c.getWorld());
+
+                    Set<Gate> gatesForC = gatesByChunk.get(sc);
+
+                    if (gatesForC == null) {
+                        gatesForC = new HashSet<Gate>(); // NOTE: not optimizing size here
+                        gatesByChunk.put(sc, gatesForC);
+                    }
+
+                    gatesForC.add(g);
+                }
+            }
+        }
+	}
+	
+	
+	public void storeInvalidGate(Map<String, Object> map)
+	{
+		File invalidGatesFile = new File(Plugin.getPlugin().getDataFolder(), "invalid_gates.yml");
+		Boolean invalidGatesFileExists = invalidGatesFile.exists();
+		
+		try {
+			FileWriter fileWriter = new FileWriter(invalidGatesFile, true);
+			
+			if (!invalidGatesFileExists) {
+				fileWriter.write("gates:\n");
+			}
+			
+			fileWriter.write("- ==: ");
+			fileWriter.write(map.get("==").toString() + "\n");
+			map.remove("==");
+			
+			fileWriter.write("\topen: false\n");
+			map.remove("open");
+			
+			fileWriter.write("\tgateBlocks: []\n");
+			map.remove("gateBlocks");
+			
+			
+			for (String key : map.keySet()) {
+				Object value = map.get(key);
+				
+				fileWriter.write("\t" + key + ": ");
+				
+				if (value instanceof Map) {
+					fileWriter.write("\n");
+					
+					@SuppressWarnings("unchecked")
+					Map<String, Object> valueMap = (Map<String, Object>)value;
+					
+					for (String k : valueMap.keySet()) {
+						Object v = valueMap.get(k);
+					
+						fileWriter.write("\t\t" + k + ": " + v.toString() + "\n");
+					}
+
+				}
+				else {
+					fileWriter.write(value.toString() + "\n");
+				}
+			}
+			
+			fileWriter.close();
+		}
+		catch (IOException e) {
+			Plugin.log("ERROR: Could not save invalid gates to disk. Reason: \n" + Arrays.toString(e.getStackTrace()));
+		}
+	}
+	
+	
+	public void handleGateIdChange(final Gate g, final String oldId)
+	{
+		this.removeGateById(oldId);
+		this.addGateWithId(g);
+	}
+	
+	
+	public void handleGateLocationChange(final Gate g,
+                                         final Location oldLocation,
+                                         final Set<Location> oldGateBlockLocations,
+                                         final Set<Block> oldGateFrameBlocks)
+	{
+		this.removeGateFromChunk(g, oldLocation);
+		this.addGateByChunk(g);
+		
+		this.removeGateByLocation(oldGateBlockLocations);
+		this.addGateByLocations(g);
+
+        this.removeGateByFrameLocation(oldGateFrameBlocks);
+        this.addGateByFrameLocations(g);
+	}
+	
+	
+	public void handleNewGate(final Gate g)
+	{
+		this.gates.add(g);
+
+        this.addGateByChunk(g);
+		this.addGateByLocations(g);
+		this.addGateWithId(g);
+        this.addGateByFrameLocations(g);
+	}
+	
+	
+	public void handleDeletion(final Gate g)
+	{
+        this.gates.remove(g);
+
+        this.removeGateById(g.getId());
+		this.removeGateFromChunk(g, g.getLocation());
+		this.removeGateByLocation(g.getGateBlockLocations());
+        this.removeGateByFrameLocation(g.getGateFrameBlocks());
+	}
+	
+	
+	public boolean gateExists(final String id)
+	{
+		return gatesById.containsKey(id.toLowerCase());
+	}
+	
+	
+	public List<Gate> allGates ()
+	{
+		return gates;
+	}
+}

src/de/craftinc/gates/Plugin.java

@@ -1,49 +1,68 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates;
 
-import java.io.File;
+import java.util.*;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+
+import de.craftinc.gates.listeners.*;
+import net.milkbowl.vault.permission.Permission;
+
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.configuration.serialization.ConfigurationSerialization;
 import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import de.craftinc.gates.commands.*;
-import de.craftinc.gates.listeners.PluginBlockListener;
-import de.craftinc.gates.listeners.PluginPlayerListener;
-import de.craftinc.gates.listeners.PluginPortalListener;
 
 
 public class Plugin extends JavaPlugin 
 {
-	public static Plugin instance;
-	
 	public static final String permissionInfo = "craftincgates.info";
 	public static final String permissionManage = "craftincgates.manage";
-	public static final String permissionAll = "craftincgates.*";
 	public static final String permissionUse = "craftincgates.use";
 
-	public PluginPlayerListener playerListener = new PluginPlayerListener();
+    public static final String confMaxGateBlocksKey = "maxGateBlocks";
-	public PluginBlockListener blockListener = new PluginBlockListener();
+    public static final String confPlayerGateBlockUpdateRadiusKey = "playerGateBlockUpdateRadius";
-	public PluginPortalListener portalListener = new PluginPortalListener();
+    public static final String confCheckForBrokenGateFramesKey = "checkForBrokenGateFrames";
+    public static final String confGateTeleportMessageKey = "gateTeleportMessage";
+    public static final String confShowTeleportMessageKey = "showTeleportMessage";
+    public static final String confGateTeleportNoPermissionMessageKey = "gateTeleportNoPermissionMessage";
+    public static final String confShowTeleportNoPermissionMessageKey = "showTeleportNoPermissionMessage";
+    public static final String confSaveOnChangesKey = "saveOnChanges";
 	
-	private String baseCommand;
+	private static Plugin instance;
+	private static Permission permission;
 	
-	private String gatesPath = "gates";
+	protected String baseCommand;
+    protected List<BaseCommand> commands = new ArrayList<BaseCommand>();
+    protected GatesManager gatesManager = new GatesManager();
 
-	
+    protected PlayerMoveListener moveListener = new PlayerMoveListener();
-	// Commands
+    protected PlayerTeleportListener teleportListener = new PlayerTeleportListener();
-	public List<BaseCommand> commands = new ArrayList<BaseCommand>();
+    protected PlayerRespawnListener respawnListener = new PlayerRespawnListener();
+    protected PlayerChangedWorldListener worldChangeListener = new PlayerChangedWorldListener();
+    protected PlayerJoinListener joinListener = new PlayerJoinListener();
+    protected BlockBreakListener blockBreakListener = new BlockBreakListener();
 	
 	
 	public Plugin()
@@ -52,6 +71,18 @@ public class Plugin extends JavaPlugin
 	}
 	
 	
+	public static Plugin getPlugin()
+	{
+		return instance;
+	}
+	
+	
+	public GatesManager getGatesManager() 
+	{
+		return gatesManager;
+	}
+
+
 	@Override
 	public void onLoad() 
 	{
@@ -59,11 +90,31 @@ public class Plugin extends JavaPlugin
 	}
 
 
+    protected void setupPermissions()
+	{
+		if (getServer().getPluginManager().getPlugin("Vault") == null) {
+            return;
+        }
+
+		RegisteredServiceProvider<Permission> rsp = getServer().getServicesManager().getRegistration(Permission.class);
+		
+		if (rsp != null)
+		{
+			log("Using permission provider provided by Vault.");
+			permission = rsp.getProvider();
+		}
+		else 
+		{
+			log("Not using setup permission provider provided by Vault.");
+		}
+	}
+	
+
 	@Override
 	public void onDisable() 
 	{
 		// Save gates
-		saveGates();
+		gatesManager.saveGatesToDisk();
 		
 		log("Disabled");
 	}
@@ -72,34 +123,59 @@ public class Plugin extends JavaPlugin
 	@Override
 	public void onEnable() 
 	{
+		// Setup configuration
+        this.saveDefaultConfig();
+
+		// Setup permissions
+		setupPermissions();
+		
 		// Add the commands
 		commands.add(new CommandHelp());
-		commands.add(new CommandCreate());
+		commands.add(new CommandNew());
-		commands.add(new CommandDelete());
+		commands.add(new CommandRemove());
-		commands.add(new CommandSetLocation());
+		commands.add(new CommandLocation());
-		commands.add(new CommandSetExit());
+		commands.add(new CommandExit());
 		commands.add(new CommandOpen());
 		commands.add(new CommandRename());
 		commands.add(new CommandClose());
 		commands.add(new CommandList());
 		commands.add(new CommandInfo());
-		commands.add(new CommandSetHidden());
+		commands.add(new CommandHide());
-		commands.add(new CommandSetVisible());
+		commands.add(new CommandUnhide());
 
 		
 		// Register events
-		PluginManager pm = this.getServer().getPluginManager();
+		this.registerEventListeners();
-		pm.registerEvents(this.playerListener, this);
-		pm.registerEvents(this.blockListener, this);
-		pm.registerEvents(this.portalListener, this);
 		
 		// Load gates
-		loadGates();
+		boolean success = gatesManager.loadGatesFromDisk();
 
-		log("Enabled");
+        if (success) {
+            log("Enabled");
+        }
+        else {
+            PluginManager pm = this.getServer().getPluginManager();
+            pm.disablePlugin(this);
+        }
 	}
 
 
+    protected void registerEventListeners()
+    {
+        PluginManager pm = this.getServer().getPluginManager();
+
+        pm.registerEvents(this.moveListener, this);
+        pm.registerEvents(this.teleportListener, this);
+        pm.registerEvents(this.respawnListener, this);
+        pm.registerEvents(this.worldChangeListener, this);
+        pm.registerEvents(this.joinListener, this);
+
+        if (getConfig().getBoolean(confCheckForBrokenGateFramesKey)) {
+            pm.registerEvents(this.blockBreakListener, this);
+        }
+    }
+
+	
 	// -------------------------------------------- //
 	// Commands
 	// -------------------------------------------- //
@@ -146,7 +222,8 @@ public class Plugin extends JavaPlugin
 			}
 		}
 		
-		sender.sendMessage("Unknown gate-command \"" + commandName + "\". Try " + "/" + getBaseCommand() + " help");
+		sender.sendMessage(ChatColor.RED + "Unknown gate-command \"" + commandName + "\"." +
+                           ChatColor.GREEN + " Try " + "/" + getBaseCommand() + " help");
 	}
 	
 	
@@ -159,91 +236,13 @@ public class Plugin extends JavaPlugin
 	}
 	
 	
-	public static void log(Level level, String msg) {
+	public static void log(Level level, String msg) 
+	{
 		Logger.getLogger("Minecraft").log(level, "["+instance.getDescription().getFullName()+"] "+msg);
 	}
 
-	/*
-	 * Saving and Loading Gates
-	 */
-	public void loadGates() 
-	{
-		File gatesFile = new File(getDataFolder(), "gates.yml");
-		FileConfiguration gatesConfig = YamlConfiguration.loadConfiguration(gatesFile);
 
-		gatesConfig.getList(gatesPath); // this will create all the gates
+	public static Permission getPermission() {
-	}
+		return permission;
-	
-	
-	public void saveGates()
-	{
-		File gatesFile = new File(getDataFolder(), "gates.yml");
-		FileConfiguration gatesConfig = YamlConfiguration.loadConfiguration(gatesFile);
-		
-		gatesConfig.set(gatesPath, new ArrayList<Object>(Gate.getAll()));
-		
-		try {
-			gatesConfig.save(gatesFile);
-		} 
-		catch (IOException e) {
-			log("ERROR: Could not save gates to disk.");
-			e.printStackTrace();
-		}
-	}
-	
-	
-	public void storeInvalidGate(Map<String, Object> map)
-	{
-		File invalidGatesFile = new File(getDataFolder(), "invalid_gates.yml");
-		Boolean invalidGatesFileExists = invalidGatesFile.exists();
-		
-		try {
-			FileWriter fileWriter = new FileWriter(invalidGatesFile, true);
-			
-			if (!invalidGatesFileExists) {
-				fileWriter.write("gates:\n");
-			}
-			
-			fileWriter.write("- ==: ");
-			fileWriter.write(map.get("==").toString() + "\n");
-			map.remove("==");
-			
-			fileWriter.write("\topen: false\n");
-			map.remove("open");
-			
-			fileWriter.write("\tgateBlocks: []\n");
-			map.remove("gateBlocks");
-			
-			
-			for (String key : map.keySet()) {
-				Object value = map.get(key);
-				
-				fileWriter.write("\t" + key + ": ");
-				
-				if (value instanceof Map) {
-					fileWriter.write("\n");
-					
-					@SuppressWarnings("unchecked")
-					Map<String, Object> valueMap = (Map<String, Object>)value;
-					
-					for (String k : valueMap.keySet()) {
-						Object v = valueMap.get(k);
-					
-						fileWriter.write("\t\t" + k + ": " + v.toString() + "\n");
-					}
-
-				}
-				else {
-					fileWriter.write(value.toString() + "\n");
-				}
-				
-			}
-			
-			fileWriter.close();
-		}
-		catch (IOException e) {
-			log("ERROR: Could not save invalid gates to disk.");
-			e.printStackTrace();
-		}
 	}
 }

src/de/craftinc/gates/commands/BaseCommand.java

@@ -1,54 +1,65 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates.commands;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import de.craftinc.gates.Gate;
+import de.craftinc.gates.GatesManager;
 import de.craftinc.gates.Plugin;
 import de.craftinc.gates.util.TextUtil;
 
 public abstract class BaseCommand 
 {
-	public List<String> aliases;
+	protected List<String> aliases = new ArrayList<String>();
-	public List<String> requiredParameters;
+	protected List<String> requiredParameters = new ArrayList<String>();
-	public List<String> optionalParameters;
+	protected List<String> optionalParameters = new ArrayList<String>();
 	
-	public String helpDescription;
+	protected String helpDescription = "no description";
 	
-	public CommandSender sender;
+	protected List<String> parameters;
-	public boolean senderMustBePlayer;
+	protected CommandSender sender;
-	public boolean hasGateParam;
+	protected Player player;
-	public Player player;
+	protected Gate gate;
-	public Gate gate;
 	
-	public List<String> parameters;
+	protected boolean senderMustBePlayer = true;
+	protected boolean hasGateParam = true; 
 	
-	public String requiredPermission;
+	protected String requiredPermission;
+	protected boolean needsPermissionAtCurrentLocation;
 	
+	protected boolean shouldPersistToDisk;
 
-	public BaseCommand() {
-		aliases = new ArrayList<String>();
-		requiredParameters = new ArrayList<String>();
-		optionalParameters = new ArrayList<String>();
-		
-		senderMustBePlayer = true;
-		hasGateParam = true;
-		
-		helpDescription = "no description";
-	}
 	
 	public List<String> getAliases() {
 		return aliases;
 	}
 	
+	
 	public void execute(CommandSender sender, List<String> parameters) {
 		this.sender = sender;
 		this.parameters = parameters;
 		
-		if ( ! validateCall()) {
+		if (!this.validateCall()) {
 			return;
 		}
 		
@@ -56,86 +67,154 @@ public abstract class BaseCommand
 			this.player = (Player)sender;
 		}
 		
-		perform();
+		this.perform();
+		
+		if (this.shouldPersistToDisk && Plugin.getPlugin().getConfig().getBoolean(Plugin.confSaveOnChangesKey)) {
+			Plugin.getPlugin().getGatesManager().saveGatesToDisk();
+		}
 	}
 	
-	public void perform() {
 	
-	}
+	abstract protected void perform();
 	
-	public void sendMessage(String message) {
+	
+	protected void sendMessage(String message) {
 		sender.sendMessage(message);
 	}
 	
-	public void sendMessage(List<String> messages) {
+	
+	protected void sendMessage(List<String> messages) {
 		for(String message : messages) {
 			this.sendMessage(message);
 		}
 	}
 	
-	public boolean validateCall() 
+	
+	protected boolean validateCall() 
 	{
-		// validate player		
+		boolean allParametersThere = parameters.size() >= requiredParameters.size();
-		if ( this.senderMustBePlayer && ! (sender instanceof Player)) 
+		boolean senderIsPlayer = this.sender instanceof Player;
-		{
+		boolean hasGateParameter = false;
-			sendMessage("This command can only be used by ingame players.");
+		
-			return false;
+		if (this.hasGateParam && this.parameters.size() > 0 && this.setGateUsingParameter(this.parameters.get(0))) {
+			hasGateParameter = true;
 		}
 		
-		// validate permission
+		boolean senderHasPermission = this.hasPermission();
-		if( !hasPermission(sender)) 
+		boolean valid;
-		{
+		
-			sendMessage("You lack the permissions to "+this.helpDescription.toLowerCase()+".");
+		if (this.senderMustBePlayer && !senderIsPlayer) {
+			sendMessage(ChatColor.RED + "This command can only be used by ingame players.");
+			valid = false;
+		}
+		else {
+            if (!allParametersThere) {
+                sendMessage(ChatColor.RED + "Some parameters are missing! " + ChatColor.AQUA + "Usage: " + this.getUsageTemplate(true));
+                valid = false;
+            }
+            else if ((!senderHasPermission && this.hasGateParam) ||
+                       (!senderHasPermission) ||
+                       (this.hasGateParam && !hasGateParameter)) {
+
+                sendMessage(ChatColor.RED + "You either provided a invalid gate or do not have permission to " + this.helpDescription.toLowerCase());
+                valid = false;
+            }
+            else {
+                valid = true;
+            }
+        }
+		
+		return valid;
+	}
+	
+	
+	protected boolean setGateUsingParameter(String param)
+	{
+		GatesManager gateManager = Plugin.getPlugin().getGatesManager();
+		
+		if (!gateManager.gateExists(param)) {
 			return false;
 		}
+		else {
+			gate = gateManager.getGateWithId(param);
+			return true;
+		}
+	}
 	
-		// valide parameter count
+	
-		if (parameters.size() < requiredParameters.size()) 
+	/**
-		{
+	 * This will return false if a gate is required for this command but this.gate == null.
-			sendMessage("Usage: "+this.getUseageTemplate(true));
+	 */
-			return false;
+	protected boolean hasPermission()
+	{		
+		if (Plugin.getPermission() == null) { // fallback - use the standard bukkit permission system
+			return this.sender.hasPermission(this.requiredPermission);
 		}
 
-		// validate gate parameter
+		if (!(this.sender instanceof Player)) {
-		if (this.hasGateParam) 
+            // sender is no player - there is no information about the senders locations
-		{
+            return Plugin.getPermission().has(this.sender, this.requiredPermission);
-			String id = parameters.get(0);
+		}
 
-			if ( ! Gate.exists(id)) 
+		
-			{
+		Player p = (Player) this.sender;
-				sendMessage("There exists no gate with id "+id);
+		boolean hasPermission = false;
-				return false;
+		
+		if (this.requiredPermission.equals(Plugin.permissionInfo)) {
+
+			if (this.hasGateParam) {
+				hasPermission = this.hasPermissionAtGateLocationAndExit(p);
+			}
+			else {
+				hasPermission = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission);
+			}
+		}
+		else if (this.requiredPermission.equals(Plugin.permissionUse) ) {
+			hasPermission = this.hasPermissionAtGateLocationAndExit(p);
+		}
+		else if (this.requiredPermission.equals(Plugin.permissionManage)) {
+
+			if (this.needsPermissionAtCurrentLocation && this.hasGateParam) {
+				boolean hasPersmissionAtCurrentLocation = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission);
+				hasPermission = hasPersmissionAtCurrentLocation && this.hasPermissionAtGateLocationAndExit(p);
+			}
+			else if (this.needsPermissionAtCurrentLocation) {
+				hasPermission = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission);
+			}
+			else {
+				hasPermission = this.hasPermissionAtGateLocationAndExit(p);
 			}
-			gate = Gate.get(id);
 		}
 		
-		return true;
+		return hasPermission;
 	}
 	
-	public boolean hasPermission(CommandSender sender) 
+	
+	protected boolean hasPermissionAtGateLocationAndExit(Player p)
 	{
-		if (sender.hasPermission(Plugin.permissionAll)) {
+		if (this.gate == null || p == null) { // make sure we don't run into a nullpointer exception
-			return true;
+			return false;
 		}
 		
-		if (sender.hasPermission(requiredPermission)) {
+		boolean permAtLocation = this.gate.getLocation() == null || Plugin.getPermission().has(this.gate.getLocation().getWorld(), p.getName(), this.requiredPermission);
-			return true;
+		boolean permAtExit = this.gate.getExit() == null || Plugin.getPermission().has(this.gate.getExit().getWorld(), p.getName(), this.requiredPermission);
-		}
 
-		return false; 
+		return permAtLocation & permAtExit;
 	}
 	
+	
 	// -------------------------------------------- //
 	// Help and usage description
 	// -------------------------------------------- //
-	public String getUsageTemplate(boolean withColor, boolean withDescription) {
+	protected String getUsageTemplate(boolean withColor, boolean withDescription)
+    {
 		String ret = "";
 		
-//		if (withColor) {
+		if (withColor) {
-//			ret += Conf.colorCommand;
+			ret += ChatColor.AQUA;
-//		}
+		}
 		
-		ret += "/" + Plugin.instance.getBaseCommand() + " " + TextUtil.implode(this.getAliases(), ",")+" ";
+		ret += "/" + Plugin.getPlugin().getBaseCommand() + " " + TextUtil.implode(this.getAliases(), ",")+" ";
 		
 		List<String> parts = new ArrayList<String>();
 		
@@ -147,23 +226,26 @@ public abstract class BaseCommand
 			parts.add("*["+optionalParameter+"]");
 		}
 		
-//		if (withColor) {
+		if (withColor) {
-//			ret += Conf.colorParameter;
+			ret += ChatColor.DARK_AQUA;
-//		}
+		}
 		
 		ret += TextUtil.implode(parts, " ");
 		
-//		if (withDescription) {
+		if (withDescription) {
-//			ret += "  "+Conf.colorSystem + this.helpDescription;
+			ret += " ";
-//		}
+			
+			if (withColor) {
+				ret += ChatColor.YELLOW;
+			}
+			
+			ret += this.helpDescription;
+		}
 		return ret;
 	}
 	
-	public String getUseageTemplate(boolean withColor) {
+	protected String getUsageTemplate(boolean withColor)
+    {
 		return getUsageTemplate(withColor, false);
 	}
-	
-	public String getUseageTemplate() {
-		return getUseageTemplate(true);
-	}
 }

src/de/craftinc/gates/commands/BaseLocationCommand.java

@@ -1,3 +1,19 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates.commands;
 
 import org.bukkit.Location;
@@ -9,8 +25,8 @@ public abstract class BaseLocationCommand extends BaseCommand
 {
 	protected Location getValidPlayerLocation()
 	{
-		// The player might stand in a halfblock or a sign or whatever
+		// The player might stand in a half block or a sign or whatever
-		// Therefore we load som extra locations and blocks
+		// Therefore we load some extra locations and blocks
 		Block playerBlock = player.getLocation().getBlock();
 		Block upBlock = playerBlock.getRelative(BlockFace.UP);
                 

src/de/craftinc/gates/commands/CommandClose.java

@@ -1,5 +1,26 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates.commands;
 
+import java.util.logging.Level;
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.ChatColor;
+
 import de.craftinc.gates.Plugin;
 
 
@@ -8,25 +29,36 @@ public class CommandClose extends BaseCommand
 	public CommandClose()
 	{
 		aliases.add("close");
+		aliases.add("c");
 		
 		requiredParameters.add("id");	
 		
 		helpDescription = "Closes a gate to prevent players from using it.";
 		
 		requiredPermission = Plugin.permissionManage;
+		
+		needsPermissionAtCurrentLocation = false;
+		shouldPersistToDisk = true;
+		
+		senderMustBePlayer = false;
 	}
 	
 	
 	@Override
 	public void perform() 
 	{
-		try {
+		try 
+		{
 			gate.setOpen(false);
+            GateBlockChangeSender.updateGateBlocks(gate);
+			sendMessage(ChatColor.GREEN + "The gate was closed.");
 		}
-		catch(Exception e) {
+		catch(Exception e) 
+		{
+			sendMessage(ChatColor.RED + "Opening the gate failed! See server log for more information");
+			Plugin.log(Level.WARNING, e.getMessage());
+			e.printStackTrace();
 		}
-		
-		sendMessage("The gate was closed.");
 	}
 }
 

src/de/craftinc/gates/commands/CommandCreate.java

@@ -1,58 +0,0 @@
-package de.craftinc.gates.commands;
-
-import org.bukkit.Location;
-
-import de.craftinc.gates.Gate;
-import de.craftinc.gates.Plugin;
-
-
-public class CommandCreate extends BaseLocationCommand 
-{
-	public CommandCreate() 
-	{
-		aliases.add("create");
-		aliases.add("new");
-		
-		requiredParameters.add("id");		
-		
-		senderMustBePlayer = true;
-		hasGateParam = false;
-		
-		helpDescription = "Create a gate at your current location.";
-		
-		requiredPermission = Plugin.permissionManage;
-	}
-	
-	
-	public void perform() 
-	{
-		String id = parameters.get(0);
-		
-		try {
-			gate = Gate.create(id);
-		} 
-		catch (Exception e) {
-			System.out.println(e.getMessage());
-		}
-		
-		Location playerLocation = getValidPlayerLocation();
-		
-		if (playerLocation != null) {
-			try {
-				gate.setLocation(playerLocation);
-			} 
-			catch (Exception e) {
-			}
-			
-			sendMessage("Gate with id \"" + id + "\" was created.");
-			sendMessage("The gates location has been set to your current location.");
-		}
-		else {
-			sendMessage("Gate with id \"" + id + "\" was created.");
-			sendMessage("Now you should build a frame and:");
-			sendMessage(new CommandSetLocation().getUsageTemplate(true, true));
-		}
-	}
-
-}
-

src/de/craftinc/gates/commands/CommandDelete.java

@@ -1,31 +0,0 @@
-package de.craftinc.gates.commands;
-
-import de.craftinc.gates.Gate;
-import de.craftinc.gates.Plugin;
-
-
-public class CommandDelete extends BaseCommand 
-{
-	public CommandDelete() 
-	{
-		aliases.add("delete");
-		aliases.add("del");
-		aliases.add("remove");
-		aliases.add("rm");
-		
-		requiredParameters.add("id");		
-		
-		senderMustBePlayer = false;
-		helpDescription = "Removes the gate from the game.";
-		
-		requiredPermission = Plugin.permissionManage;
-	}
-	
-	
-	public void perform() 
-	{
-		Gate.delete(gate.getId());
-		sendMessage("Gate with id '" + gate.getId() + "' was deleted.");
-	}
-}
-

src/de/craftinc/gates/commands/CommandExit.java

@@ -0,0 +1,61 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.commands;
+
+import java.util.logging.Level;
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.ChatColor;
+
+import de.craftinc.gates.Plugin;
+
+
+public class CommandExit extends BaseCommand
+{
+	public CommandExit()
+	{
+		aliases.add("exit");
+		aliases.add("e");
+		
+		requiredParameters.add("id");		
+		
+		helpDescription = "Change exit of location.";
+		
+		requiredPermission = Plugin.permissionManage;
+		
+		needsPermissionAtCurrentLocation = true;
+		shouldPersistToDisk = true;
+		senderMustBePlayer = true;
+	}
+	
+	
+	public void perform() 
+	{
+		try 
+		{
+			gate.setExit(player.getLocation());
+			sendMessage(ChatColor.GREEN + "The exit of gate '" + gate.getId() + "' is now where you stand.");
+		} 
+		catch (Exception e) {
+            GateBlockChangeSender.updateGateBlocks(gate);
+            sendMessage(ChatColor.RED + "Setting the exit for the gate failed! See server log for more information");
+			Plugin.log(Level.WARNING, e.getMessage());
+			e.printStackTrace();
+		}
+	}
+}
+

src/de/craftinc/gates/commands/CommandHelp.java

@@ -1,94 +1,109 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates.commands;
 
-import java.util.ArrayList;
+import de.craftinc.gates.Plugin;
-
-import org.bukkit.command.CommandSender;
-
 import de.craftinc.gates.util.TextUtil;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 public class CommandHelp extends BaseCommand 
 {
+	public static List<List<String>> helpPages;
+	
+	static 
+	{
+		// sort the usage strings
+		List<String> allUsageStrings = new ArrayList<String>();
+		
+		allUsageStrings.add( new CommandHelp().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandNew().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandRemove().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandLocation().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandExit().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandOpen().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandRename().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandClose().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandList().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandInfo().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandHide().getUsageTemplate(true, true) );
+		allUsageStrings.add( new CommandUnhide().getUsageTemplate(true, true) );
+		
+		Collections.sort(allUsageStrings);
+		
+		
+		// put 5 commands on one page
+		helpPages = new ArrayList<List<String>>();
+		
+		while (!allUsageStrings.isEmpty()) {
+			int toIndex = allUsageStrings.size() >= 6 ? 5 : allUsageStrings.size();
+			List<String> currentHelpPage = new ArrayList<String>(allUsageStrings.subList(0, toIndex));
+			helpPages.add(currentHelpPage);
+			
+			allUsageStrings.removeAll(currentHelpPage);
+		}
+	}
+	
 	
 	public CommandHelp() 
 	{
 		aliases.add("help");
-		aliases.add("h");
 		aliases.add("?");
 		
 		optionalParameters.add("page");
+		helpDescription = "prints this help page";
+		
+		requiredPermission = Plugin.permissionInfo;
+		
 		hasGateParam = false;
-		
+		needsPermissionAtCurrentLocation = false;
-		helpDescription = "Prints a list of all availible commands.";
+		shouldPersistToDisk = false;
-	}
+		senderMustBePlayer = false;
-	
-	@Override
-	public boolean hasPermission(CommandSender sender) 
-	{
-		return true;
 	}
 
 
-	public void perform() 
+    public void perform()
-	{
+    {
-		int page = 1;
+		int page;
 		
-		if (parameters.size() > 0) 
+		if (parameters.size() > 0) {
-		{
+			try {
-			try 
-			{
 				page = Integer.parseInt(parameters.get(0));
 			} 
-			catch (NumberFormatException e) 
+			catch (NumberFormatException e) {
-			{
 				// wasn't an integer
+                page = 1;
 			}
 		}
+        else {
+            page = 1;
+        }
 		
-		sendMessage(TextUtil.titleize("Craft Inc. Gates Help ("+page+"/"+helpPages.size()+")"));
+		sendMessage(TextUtil.titleize("Craft Inc. Gates Help (" + page + "/" + helpPages.size() + ")"));
 		
 		page -= 1;
-		if (page < 0 || page >= helpPages.size()) 
+		if (page < 0 || page >= helpPages.size()) {
-		{
 			sendMessage("This page does not exist");
 			return;
 		}
 		
 		sendMessage(helpPages.get(page));
 	}
-	
-	
-	//----------------------------------------------//
-	// Build the help pages
-	//----------------------------------------------//
-	
-	public static ArrayList<ArrayList<String>> helpPages;
-	
-	static 
-	{
-		helpPages = new ArrayList<ArrayList<String>>();
-		ArrayList<String> pageLines;
-
-		pageLines = new ArrayList<String>();
-		
-		pageLines.add( new CommandHelp().getUsageTemplate(true, true) );
-		pageLines.add( new CommandCreate().getUsageTemplate(true, true) );
-		pageLines.add( new CommandDelete().getUsageTemplate(true, true) );
-		pageLines.add( new CommandSetLocation().getUsageTemplate(true, true) );
-		pageLines.add( new CommandSetExit().getUsageTemplate(true, true) );
-		pageLines.add( new CommandOpen().getUsageTemplate(true, true) );
-		
-		helpPages.add(pageLines);
-		pageLines = new ArrayList<String>();
-		
-		pageLines.add( new CommandRename().getUsageTemplate(true, true) );
-		pageLines.add( new CommandClose().getUsageTemplate(true, true) );
-		pageLines.add( new CommandList().getUsageTemplate(true, true) );
-		pageLines.add( new CommandInfo().getUsageTemplate(true, true) );
-		pageLines.add( new CommandSetHidden().getUsageTemplate(true, true) );
-		pageLines.add( new CommandSetVisible().getUsageTemplate(true, true) );
-		
-		helpPages.add(pageLines);
-	}
-	
 }
 

src/de/craftinc/gates/commands/CommandHide.java

@@ -0,0 +1,59 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.commands;
+
+import java.util.logging.Level;
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.ChatColor;
+
+import de.craftinc.gates.Plugin;
+
+
+public class CommandHide extends BaseCommand
+{
+	public CommandHide()
+	{
+		aliases.add("hide");
+        aliases.add("h");
+		
+		requiredParameters.add("id");		
+		
+		helpDescription = "Makes a gate NOT consist of gate blocks while open.";
+		
+		requiredPermission = Plugin.permissionManage;
+		
+		needsPermissionAtCurrentLocation = false;
+		shouldPersistToDisk = true;
+		senderMustBePlayer = false;
+	}
+	
+	
+	public void perform() 
+	{
+		try {
+			gate.setHidden(true);
+            GateBlockChangeSender.updateGateBlocks(gate);
+			sendMessage(ChatColor.GREEN + "The gate '" + gate.getId() + "' is now hidden.");
+		} 
+		catch (Exception e) {
+			sendMessage(ChatColor.RED + "Hiding the gate failed! See server log for more information");
+			Plugin.log(Level.WARNING, e.getMessage());
+			e.printStackTrace();
+		}
+	}
+}

src/de/craftinc/gates/commands/CommandInfo.java

@@ -1,8 +1,26 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates.commands;
 
+
 import org.bukkit.ChatColor;
 
 import de.craftinc.gates.Plugin;
+import de.craftinc.gates.util.TextUtil;
 
 
 public class CommandInfo extends BaseCommand 
@@ -10,43 +28,50 @@ public class CommandInfo extends BaseCommand
 	public CommandInfo()
 	{
 		aliases.add("info");
-		aliases.add("details");
+		aliases.add("i");
 
 		requiredParameters.add("id");		
 		
-		helpDescription = "Prints detailed informations about a certain gate.";
+		helpDescription = "Print detailed information about a certain gate.";
 		
 		requiredPermission = Plugin.permissionInfo;
+		
+		needsPermissionAtCurrentLocation = false;
+		shouldPersistToDisk = false;
+		senderMustBePlayer = false;
 	}
 	
 	
 	public void perform() 
 	{
-		sendMessage(ChatColor.LIGHT_PURPLE + "Information about " + ChatColor.WHITE + gate.getId() + ChatColor.LIGHT_PURPLE + ":");
+		sendMessage(TextUtil.titleize("Information about: '" + ChatColor.WHITE + gate.getId() + ChatColor.YELLOW + "'"));
 		
-		String openHiddenMessage = "This gate is";
+		String openHiddenMessage = ChatColor.DARK_AQUA + "This gate is";
 		
 		if (gate.isOpen())
-			openHiddenMessage += " open";
+			openHiddenMessage += ChatColor.AQUA + " open";
 		else
-			openHiddenMessage += " closed";
+			openHiddenMessage += ChatColor.AQUA + " closed";
 		
 		if (gate.isHidden())
-			openHiddenMessage += " and hidden";
+			openHiddenMessage += ChatColor.DARK_AQUA +" and" + ChatColor.AQUA + " hidden";
 		
-		openHiddenMessage += ".";
+		openHiddenMessage += ".\n";
 		
 		sendMessage(openHiddenMessage);
 		
 		if (gate.getLocation() != null)
-			sendMessage(ChatColor.GREEN + "'from' location:       " + ChatColor.YELLOW + "( " + gate.getLocation().getBlockX() + " | " + gate.getLocation().getBlockY() + " | " + gate.getLocation().getBlockZ() + " ) in " + gate.getLocation().getWorld().getName());
+			sendMessage(ChatColor.DARK_AQUA + "from:  " + ChatColor.AQUA + "( " + (int)gate.getLocation().getX() +
+                        " | " + (int)gate.getLocation().getY() + " | " + (int)gate.getLocation().getZ() + " ) in " +
+                        gate.getLocation().getWorld().getName());
 		else
-			sendMessage(ChatColor.GREEN + "this gate has no 'from' location");
+			sendMessage(ChatColor.DARK_AQUA + "NOTE: this gate has no location");
 		
 		if (gate.getExit() != null)
-			sendMessage(ChatColor.GREEN + "'to' location:          " + ChatColor.YELLOW + "( " + gate.getExit().getBlockX() + " | " + gate.getExit().getBlockY() + " | " + gate.getExit().getBlockZ() + " ) in " + gate.getExit().getWorld().getName());
+			sendMessage(ChatColor.DARK_AQUA + "to:     " + ChatColor.AQUA + "( " + (int)gate.getExit().getX() + " | "
+                        + (int)gate.getExit().getY() + " | " + (int)gate.getExit().getZ() + " ) in " +
+                        gate.getExit().getWorld().getName());
 		else
-			sendMessage(ChatColor.GREEN + "this gate has no 'to' location");
+			sendMessage(ChatColor.DARK_AQUA + "NOTE: this gate has no exit");
 	}
-
 }

src/de/craftinc/gates/commands/CommandList.java

@@ -1,3 +1,19 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates.commands;
 
 import java.util.ArrayList;
@@ -6,6 +22,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
 
 import de.craftinc.gates.Gate;
 import de.craftinc.gates.Plugin;
@@ -14,6 +31,15 @@ import de.craftinc.gates.util.TextUtil;
 
 public class CommandList extends BaseCommand
 {
+	protected static final int linesPerPage = 10; 
+	protected static final int charactersPerLine = 52; /* this is actually no true. the 
+														  font used by minecraft is not
+														  monospace. but I don't think 
+														  there is a (easy) way for a 
+														  bukkit plugin to calculate 
+														  the drawing-size of a string. 
+														*/
+	
 	public CommandList() 
 	{
 		aliases.add("list");
@@ -21,51 +47,159 @@ public class CommandList extends BaseCommand
 		
 		optionalParameters.add("page");
 		hasGateParam = false;
+		needsPermissionAtCurrentLocation = false;
 		
-		helpDescription = "Prints a list of all availible gates.";
+		helpDescription = "lists all availible gates.";
 		
 		requiredPermission = Plugin.permissionInfo;
+		shouldPersistToDisk = false;
+		senderMustBePlayer = false;
 	}
 	
 	
-	protected String intToTitleString(int i)
+	protected static List<String> linesOfGateIds(List<String> gates)
 	{
+		List<String> lines = new ArrayList<String>();
+		
+		int index = 0;
+		List<String> gateIdsForCurrentLine = new ArrayList<String>();
+		int numCharactersInCurrentLine = 0;
+		
+		
+		while (index < gates.size()) {
+			String gateId = gates.get(index);
+			int gateIdLength = gateId.length() + 2; // actual length + comma + whitespace
+			
+			// special case: very long gate id
+			if (gateIdLength > charactersPerLine && numCharactersInCurrentLine == 0) {
+				gateIdsForCurrentLine = new ArrayList<String>();
+				numCharactersInCurrentLine = 0;
+				
+				while ((gateId.length() + 2) > charactersPerLine) {
+					
+					int cutPos = charactersPerLine;
+					
+					// is the id too long to add comma and whitespace but not longer than the line?
+					if (gateId.length() <= charactersPerLine) {
+						cutPos -= 2;
+					}
+					
+					lines.add(gateId.substring(0, cutPos));
+					gateId = gateId.substring(cutPos, gateId.length());
+					
+				}
+
+				gateIdsForCurrentLine.add(gateId);
+				
+				numCharactersInCurrentLine += gateId.length();
+				index++;
+			}
+			
+			// gate fits into current line
+			else if ((numCharactersInCurrentLine + gateIdLength) <= charactersPerLine) {
+				gateIdsForCurrentLine.add(gateId);
+				numCharactersInCurrentLine += gateIdLength;
+				
+				index++;
+			}
+			
+			// the current gate does not fit on the
+			else {  
+				lines.add(TextUtil.implode(gateIdsForCurrentLine, ", ") + ", ");
+				
+				gateIdsForCurrentLine = new ArrayList<String>();
+				numCharactersInCurrentLine = 0;
+			}	
+		}
+		
+		lines.add(TextUtil.implode(gateIdsForCurrentLine, ", "));
+		return lines;
+	}
+	
+	
+	protected static String intToTitleString(int i, boolean addPreviousPageNote, boolean addNextPageNote)
+	{
+		String retVal = ChatColor.DARK_AQUA + "";
+		
 		if ( i < 26 ) {
-			return ChatColor.GREEN + "" + (char)(i+65) + ":";
+			retVal += (char)(i+65);
 		}
 		else if ( i == 26 ) {
-			return ChatColor.GREEN + "0 - 9:";
+			retVal += "0-9";
 		} 
 		else {
-			return ChatColor.GREEN + "!@#$:";
+			retVal += "!@#$";
 		}
+		
+		if (addPreviousPageNote && addNextPageNote) {
+			retVal += " (more on previous and next page)";
+		}
+		else if (addPreviousPageNote) {
+			retVal += " (more on previous page)";
+		}
+		else if (addNextPageNote) {
+			retVal += " (more on next page)";
+		}
+		
+		return retVal + "\n";
 	}
 	
 	
-	
+	/**
-	// pages start at 1
+	 * Method for getting a collection of gates the player is allowed to see.
-	// will return null if requested page not availible
+	 */
-	protected List<String> message(int page)
+	protected Collection<Gate> getAllGates()
 	{
-		Collection<Gate> gates = Gate.getAll();
+		Collection<Gate> gates = Plugin.getPlugin().getGatesManager().allGates();
 		
-		if (gates.size() == 0) {
+		if (this.sender instanceof Player && Plugin.getPermission() != null) {
-			return null;
+			Player p = (Player)this.sender;
+			
+			// create a copy since we cannot iterate over a collection while modifying it!
+			Collection<Gate> gatesCopy = new ArrayList<Gate>(gates); 
+			
+			for (Gate gate : gatesCopy) {
+				
+				if (gate.getLocation() != null) {
+				boolean permissionAtGateLocation = Plugin.getPermission().has(gate.getLocation().getWorld(), p.getName(), this.requiredPermission);
+				if (!permissionAtGateLocation) {
+					gates.remove(gate);
+					continue;
+					}
+				}
+				
+				if (gate.getExit() != null) {
+					
+					boolean permissionAtGateExit = Plugin.getPermission().has(gate.getExit().getWorld(), p.getName(), this.requiredPermission);
+					if (!permissionAtGateExit) {
+						gates.remove(gate);
+					}
+				}
+			}
 		}
 		
-		/* sort all gates by there first character
+		return gates;
-		 * put gates in corresponding Lists
+	}
-		 * list 0-25: a,b,c, ... ,z
+	
-		 * list 26: 0-9
+	
-		 * list 27: other
+	/**
-		 */
+	 * Sorts all gates by there first character.
+	 * Puts gates in corresponding Lists: (all returned lists will be sorted alphabetically)
+	 * 	list 0-25: a,b,c,..,z
+	 * 	list 26: 0-9
+	 * 	list 27: other
+	 */
+	protected static List<List<String>> gatesSortedByName(Collection<Gate> allGates)
+	{
+		// create the lists
 		List<List<String>> ids = new ArrayList<List<String>>();
 		
 		for (int i=0; i<28; i++) {
 			ids.add(new ArrayList<String>());
 		}
 		
-		for (Gate gate : gates) {
+		// put all gates into correct lists
+		for (Gate gate : allGates) {
 			String id = gate.getId();
 			int first = id.charAt(0);
 			
@@ -85,119 +219,133 @@ public class CommandList extends BaseCommand
 			ids.get(first).add(id);
 		}
 		
-		
+		// sort everything
-		/* calculating which gates will be displayed on which page.
+		for (int i=0; i<28; i++) {
-		 * this is a little bit fuzzy. but hopefully it will look
+			Collections.sort(ids.get(i));
-		 * great. (tell me if there is a better way!)
-		 */
-		
-		int currentPage = 1;
-		int currentStartingCharList = 0;
-		boolean finishedCurrentIds = true;
-		
-		List<String> pageMessages = new ArrayList<String>();
-		
-		while (currentStartingCharList < ids.size()) {
-			int linesLeftOnCurrentPage = 9;
-			
-			while (linesLeftOnCurrentPage > 1 && currentStartingCharList < ids.size()) {
-				List<String> currentIds = ids.get(currentStartingCharList);
-				
-				if (currentIds.size() > 0) {
-					// add header line
-					if (currentPage == page) {
-						pageMessages.add(intToTitleString(currentStartingCharList));
-					}
-					
-					//sort
-					Collections.sort(currentIds);
-				
-					// add ids
-					int numLinesForCurrentChar = TextUtil.implode(currentIds, ", ").length() / 52 + 2;
-					
-					if (numLinesForCurrentChar <= linesLeftOnCurrentPage) { // all ids fit on current page
-						linesLeftOnCurrentPage -= numLinesForCurrentChar;
-						
-						if (currentPage == page) {
-							pageMessages.add(TextUtil.implode(currentIds, ", "));
-							if (finishedCurrentIds == false) {
-								pageMessages.set(pageMessages.size() -2, pageMessages.get(pageMessages.size() -2) + " (more on previous page)");
-							}
-						}
-						
-						finishedCurrentIds = true;
-					}
-					else { // NOT all ids fit on current page
-						int charsAvailible = (linesLeftOnCurrentPage - 1) * 52;
-						int idsPos = 0;
-						
-						do {
-							charsAvailible -= currentIds.get(idsPos).length() + 2;				
-							idsPos++;
-						} while (charsAvailible > 0);
-						
-						List<String> idsToPutOnCurrentPage = currentIds.subList(0, idsPos);
-						currentIds.remove(idsToPutOnCurrentPage);
-						
-						String stringToPutOnCurrentPage = TextUtil.implode(idsToPutOnCurrentPage, ", ");
-						
-						if (currentPage == page) {
-							pageMessages.add(stringToPutOnCurrentPage);
-							pageMessages.set(pageMessages.size() -2, pageMessages.get(pageMessages.size() -2) + " (more on next page)");
-						}
-						
-						linesLeftOnCurrentPage -= stringToPutOnCurrentPage.length() / 52 + 2;
-						
-						finishedCurrentIds = false;
-					}
-				}
-				
-				if (finishedCurrentIds) {
-					currentStartingCharList++;
-				}
-			}
-			
-			currentPage++;
 		}
 		
-		if (pageMessages.isEmpty()) {
+		return ids;
+	}
+	
+	
+	/**
+	 * Returns a list of strings.
+	 * Each string is the text for a page.
+	 * The maximum number of lines per page is 'linesPerPage' minus 1.
+	 * Will return an empty list if no gates are availible.
+	 */
+	protected List<String> pagedGateIds()
+	{
+		Collection<Gate> gates = this.getAllGates();
+		
+		if (gates.size() == 0) {
 			return null;
 		}
-		else {
-			ArrayList<String> retVal = new ArrayList<String>();
-			retVal.add(ChatColor.LIGHT_PURPLE + "This is page " + ChatColor.WHITE + page + ChatColor.LIGHT_PURPLE + "/" + ChatColor.WHITE + --currentPage + ChatColor.LIGHT_PURPLE + ". There are " + gates.size() + " gates on this server: ");
-			retVal.addAll(pageMessages);
 		
-			return retVal;
+		List<List<String>> gatesSortedByName = gatesSortedByName(gates);
+		List<String> allPages = new ArrayList<String>();
+		int linesLeftOnPage = linesPerPage - 1;
+		String currentPageString = "";
+		
+		for (int i=0; i<gatesSortedByName.size(); i++) {
+			
+			List<String> currentGates = gatesSortedByName.get(i);
+			
+			if(currentGates.isEmpty()) {
+				continue;
+			}
+			
+			List<String> currentGatesAsLines = linesOfGateIds(currentGates);
+			boolean moreGatesOnLastPage = false;
+			
+			while (!currentGatesAsLines.isEmpty()) {
+				
+				if (linesLeftOnPage < 2) {
+					currentPageString = currentPageString.substring(0, currentPageString.length()-2); // remove newlines add the end of the page
+					allPages.add(currentPageString);
+					currentPageString = "";
+					
+					linesLeftOnPage = linesPerPage - 1;
+				}
+				
+				// calculate number of lines to add to current page
+				int linesNecessaryForCurrentGates = currentGatesAsLines.size();
+				int linesToFill;
+				boolean moreGatesOnNextPage;
+					
+				if (linesNecessaryForCurrentGates < linesLeftOnPage) {
+					linesToFill = linesNecessaryForCurrentGates;
+					moreGatesOnNextPage = false;
+				}
+				else {
+					linesToFill = linesLeftOnPage -1;
+					moreGatesOnNextPage = true;
+				}
+				
+				// add title
+				currentPageString += intToTitleString(i, moreGatesOnLastPage, moreGatesOnNextPage);
+				currentPageString +=  ChatColor.AQUA;
+				linesLeftOnPage--;
+				
+				// add gate lines
+				for (int j=0; j<linesToFill; j++) {
+					currentPageString += currentGatesAsLines.get(j) + "\n";
+				}
+				
+				// remove lines added
+				for (int j=0; j<linesToFill; j++) {
+					currentGatesAsLines.remove(0);
+				}
+				
+				// cleanup
+                moreGatesOnLastPage = linesNecessaryForCurrentGates >= linesLeftOnPage;
+				linesLeftOnPage -= linesToFill;
+			}
 		}
+		
+		// add the last page
+		if (!currentPageString.isEmpty()) {
+			currentPageString = currentPageString.substring(0, currentPageString.length()-2); // remove newlines add the end of the page
+			allPages.add(currentPageString);
+		}
+		
+		return allPages;
+	}
+	
+	
+	protected int getPageParameter()
+	{
+		int page = 1;
+		
+		try {
+			page = new Integer(parameters.get(0));
+		} 
+		catch (Exception ignored) { }
+		
+		return page;
 	}
 	
 	
 	public void perform() 
 	{
-		Collection<Gate> gates = Gate.getAll();
+		int page = this.getPageParameter();
+		List<String> allPages = this.pagedGateIds();
 
-		if (gates.size() == 0) {
+		if (allPages == null) {	// no gates exist
-			sendMessage("There are no gates yet.");
+			sendMessage(ChatColor.RED + "There are no gates yet. " + ChatColor.RESET + 
+					    "(Note that you might not be allowed to get information about certain gates)");
+			return;
 		}
-		else {
-			int page = 1;
 			
-			try {
+		if (page > allPages.size() || page < 1) {
-				page = new Integer(parameters.get(0));
+			sendMessage(ChatColor.RED + "The requested page is not availible");
-			} 
+			return;
-			catch (Exception e) {
-			}
-			
-			List<String> messages = message(page);
-			
-			if (messages == null) {
-				sendMessage("The requested page is not availible");
-			}
-			else {
-				sendMessage(messages);
-			}
 		}
+		
+		String message = TextUtil.titleize("List of all gates (" + page + "/" + allPages.size() + ")") + "\n";
+		message += allPages.get(page-1);
+
+		sendMessage(message);
 	}
 }
 

src/de/craftinc/gates/commands/CommandLocation.java

@@ -0,0 +1,85 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.commands;
+
+
+import java.util.Set;
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+
+import de.craftinc.gates.Plugin;
+import org.bukkit.block.Block;
+
+
+public class CommandLocation extends BaseLocationCommand
+{
+	
+	public CommandLocation()
+	{
+		aliases.add("location");
+		aliases.add("lo");
+		
+		requiredParameters.add("id");		
+		
+		helpDescription = "Set the entrance of the gate to your current location.";
+		
+		requiredPermission = Plugin.permissionManage;
+		
+		needsPermissionAtCurrentLocation = true;
+		shouldPersistToDisk = true;
+		senderMustBePlayer = true;
+	}
+	
+	
+	public void perform() 
+	{
+		Location playerLocation = getValidPlayerLocation();
+		
+		if (playerLocation == null) 
+		{
+			sendMessage("There is not enough room for a gate to open here");
+			return;
+		}
+
+        Location oldLocation = gate.getLocation();
+        Set<Location> oldGateBlockLocations = gate.getGateBlockLocations();
+        Set<Block> oldFrameBlocks = gate.getGateFrameBlocks();
+		
+		try 
+		{
+            if (gate.isOpen()) {
+                GateBlockChangeSender.updateGateBlocks(gate, true);
+            }
+
+            gate.setLocation(playerLocation);
+
+			sendMessage(ChatColor.GREEN + "The location of '" + gate.getId() + "' is now at your current location.");
+		} 
+		catch (Exception e) 
+		{
+            sendMessage(ChatColor.RED + "There seems to be no frame at your new location! The gate got closed!" + ChatColor.AQUA + " You should build a frame now and execute:");
+            sendMessage(new CommandOpen().getUsageTemplate(true, true));
+		}
+        finally {
+            Plugin.getPlugin().getGatesManager().handleGateLocationChange(gate, oldLocation, oldGateBlockLocations, oldFrameBlocks);
+            GateBlockChangeSender.updateGateBlocks(gate);
+        }
+    }
+}
+

src/de/craftinc/gates/commands/CommandNew.java

@@ -0,0 +1,83 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+
+import de.craftinc.gates.Gate;
+import de.craftinc.gates.GatesManager;
+import de.craftinc.gates.Plugin;
+
+
+public class CommandNew extends BaseLocationCommand
+{
+	public CommandNew()
+	{
+		aliases.add("new");
+        aliases.add("n");
+
+		requiredParameters.add("id");		
+		
+		senderMustBePlayer = true;
+		hasGateParam = false;
+		
+		helpDescription = "Create a gate at your current location.";
+		
+		requiredPermission = Plugin.permissionManage;
+		
+		needsPermissionAtCurrentLocation = true;
+		shouldPersistToDisk = true;
+		
+		senderMustBePlayer = true;
+	}
+	
+	
+	public void perform() 
+	{
+		String id = parameters.get(0);
+		GatesManager gatesManager = Plugin.getPlugin().getGatesManager();
+		
+		if (gatesManager.gateExists(id)) {
+			sendMessage(ChatColor.RED + "Creating the gate failed! " + "A gate with the supplied id already exists!");
+			return;
+		}
+		
+		gate = new Gate(id);
+		sendMessage(ChatColor.GREEN + "Gate with id '" + id + "' was created.");
+
+		
+		Location playerLocation = getValidPlayerLocation();
+		
+		if (playerLocation != null) {
+			
+			try {
+				gate.setLocation(playerLocation);
+				sendMessage(ChatColor.AQUA + "The gates location has been set to your current location.");
+			} 
+			catch (Exception ignored) {}
+		}
+		else 
+		{
+			sendMessage(ChatColor.RED + "Your location is invalid!" + ChatColor.AQUA + "Go somewhere else and execute:");
+			sendMessage(new CommandLocation().getUsageTemplate(true, true));
+		}
+
+        gatesManager.handleNewGate(gate);
+	}
+}
+

src/de/craftinc/gates/commands/CommandOpen.java

@@ -1,5 +1,25 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates.commands;
 
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.ChatColor;
+
 import de.craftinc.gates.Plugin;
 
 
@@ -9,26 +29,42 @@ public class CommandOpen extends BaseCommand
 	public CommandOpen()
 	{
 		aliases.add("open");
+		aliases.add("o");
 		
 		requiredParameters.add("id");		
 		
 		helpDescription = "Open a gate so players can use it.";
 		
 		requiredPermission = Plugin.permissionManage;
+		
+		needsPermissionAtCurrentLocation = false;
+		shouldPersistToDisk = true;
+		senderMustBePlayer = false;
 	}
 	
 	
 	public void perform() 
 	{
 		try {
-			gate.setOpen(true);
+            boolean needsGateManagerUpdate = false;
-		} catch (Exception e) {
+
-			sendMessage(e.getMessage());
+			if (gate.getGateBlockLocations().isEmpty()) {
-			return;
+                needsGateManagerUpdate = true;
+            }
+
+            gate.setOpen(true);
+
+            GateBlockChangeSender.updateGateBlocks(gate);
+
+            if (needsGateManagerUpdate) {
+                Plugin.getPlugin().getGatesManager().handleGateLocationChange(gate, null, null, null);
+            }
+
+			sendMessage(ChatColor.GREEN + "The gate was opened.");
+		} 
+		catch (Exception e) {
+			sendMessage(ChatColor.RED + e.getMessage());
 		}
-		
-		sendMessage("The gate was opened.");
 	}
-
 }
 

src/de/craftinc/gates/commands/CommandRemove.java

@@ -0,0 +1,53 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.commands;
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.ChatColor;
+
+import de.craftinc.gates.Plugin;
+
+
+public class CommandRemove extends BaseCommand
+{
+	public CommandRemove()
+	{
+		aliases.add("delete");
+		aliases.add("del");
+		aliases.add("remove");
+		
+		requiredParameters.add("id");		
+		
+		senderMustBePlayer = false;
+		helpDescription = "Removes the gate from the game.";
+		
+		requiredPermission = Plugin.permissionManage;
+		
+		needsPermissionAtCurrentLocation = false;
+		shouldPersistToDisk = true;
+		
+		senderMustBePlayer = false;
+	}
+	
+	
+	public void perform() 
+	{
+		Plugin.getPlugin().getGatesManager().handleDeletion(gate);
+        GateBlockChangeSender.updateGateBlocks(gate, true);
+		sendMessage(ChatColor.GREEN + "Gate with id '" + gate.getId() + "' was deleted.");
+	}
+}

src/de/craftinc/gates/commands/CommandRename.java

@@ -1,6 +1,24 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates.commands;
 
-import de.craftinc.gates.Gate;
+import org.bukkit.ChatColor;
+
+import de.craftinc.gates.GatesManager;
 import de.craftinc.gates.Plugin;
 
 
@@ -9,8 +27,7 @@ public class CommandRename extends BaseCommand
 	public CommandRename() 
 	{
 		aliases.add("rename");
-		aliases.add("changename");
+		aliases.add("rn");
-		aliases.add("cn");
 
 		hasGateParam = true;
 		senderMustBePlayer = false;
@@ -21,21 +38,29 @@ public class CommandRename extends BaseCommand
 		helpDescription = "Changes the id of a gate.";
 		
 		requiredPermission = Plugin.permissionManage;
+		
+		needsPermissionAtCurrentLocation = false;
+		shouldPersistToDisk = true;
+		senderMustBePlayer = false;
 	}
 	
 	
 	public void perform() 
 	{
 		String newId = parameters.get(1);
+		GatesManager gatesManager = Plugin.getPlugin().getGatesManager();
 		
-		try {
+		if (gatesManager.gateExists(newId)) {
-			Gate.rename(gate.getId(), newId);
+			sendMessage(ChatColor.RED + "Cannot rename " + gate.getId() + ". There is already a gate named " + newId + ".");
-		} 
-		catch (Exception e) {
-			sendMessage("Cannot rename " + gate.getId() + ". There is already a gate named " + newId + ".");
 		}
+		else {
+			String oldId = gate.getId();
 			
-		sendMessage("Gate " + gate.getId() + " is now known as " + newId + ".");
+			gate.setId(newId);
+			gatesManager.handleGateIdChange(gate, oldId);
+			
+			sendMessage(ChatColor.GREEN + "Gate " + gate.getId() + " is now known as " + newId + ".");
+		}
 	}
 
 }

src/de/craftinc/gates/commands/CommandSetExit.java

@@ -1,34 +0,0 @@
-package de.craftinc.gates.commands;
-
-import de.craftinc.gates.Plugin;
-
-
-public class CommandSetExit extends BaseCommand 
-{
-	
-	public CommandSetExit() 
-	{
-		aliases.add("setto");
-		aliases.add("st");
-		
-		requiredParameters.add("id");		
-		
-		helpDescription = "Changes the location where the gate will teleport players to your current location.";
-		
-		requiredPermission = Plugin.permissionManage;
-	}
-	
-	
-	public void perform() 
-	{
-		try {
-			gate.setExit(player.getLocation());
-		} 
-		catch (Exception e) {
-			sendMessage(e.getMessage());
-		}
-		
-		sendMessage("The exit of gate '" + gate.getId() + "' is now where you stand.");
-	}
-}
-

src/de/craftinc/gates/commands/CommandSetHidden.java

@@ -1,32 +0,0 @@
-package de.craftinc.gates.commands;
-
-import de.craftinc.gates.Plugin;
-
-
-public class CommandSetHidden extends BaseCommand 
-{
-	public CommandSetHidden() 
-	{
-		aliases.add("setHidden");
-		aliases.add("sh");
-		
-		requiredParameters.add("id");		
-		
-		helpDescription = "Makes a gate NOT consist of gate blocks while open.";
-		
-		requiredPermission = Plugin.permissionManage;
-	}
-	
-	
-	public void perform() 
-	{
-		try {
-			gate.setHidden(true);
-		} 
-		catch (Exception e) {
-			sendMessage(e.getMessage());
-		}
-		
-		sendMessage("The gate '" + gate.getId() + "' is now hidden.");
-	}
-}

src/de/craftinc/gates/commands/CommandSetLocation.java

@@ -1,45 +0,0 @@
-package de.craftinc.gates.commands;
-
-
-import org.bukkit.Location;
-
-import de.craftinc.gates.Plugin;
-
-
-public class CommandSetLocation extends BaseLocationCommand 
-{
-	
-	public CommandSetLocation() 
-	{
-		aliases.add("setlocation");
-		aliases.add("sl");
-		
-		requiredParameters.add("id");		
-		
-		helpDescription = "Set the entrance of the gate to your current location.";
-		
-		requiredPermission = Plugin.permissionManage;
-	}
-	
-	
-	public void perform() 
-	{
-		Location playerLocation = getValidPlayerLocation();
-		
-		if (playerLocation == null) {
-			sendMessage("There is not enough room for a gate to open here");
-			return;
-		}
-		
-		try {
-			gate.setLocation(playerLocation);
-		} 
-		catch (Exception e) {
-			sendMessage(e.getMessage());
-		}
-		
-		sendMessage("The location of '" + gate.getId() + "' is now at your current location.");
-	}
-	
-}
-

src/de/craftinc/gates/commands/CommandSetVisible.java

@@ -1,34 +0,0 @@
-package de.craftinc.gates.commands;
-
-import de.craftinc.gates.Plugin;
-
-
-public class CommandSetVisible extends BaseCommand 
-{
-	
-	public CommandSetVisible() 
-	{
-		aliases.add("makevisible");
-		aliases.add("mv");
-		
-		requiredParameters.add("id");		
-		
-		helpDescription = "Make that gate visible";
-		
-		requiredPermission = Plugin.permissionManage;
-	}
-	
-	
-	public void perform() 
-	{
-		try {
-			gate.setHidden(false);
-		}
-		catch (Exception e) {
-			sendMessage(e.getMessage());
-		}
-		
-		sendMessage("The gate " + gate.getId() + " is now visible.");
-	}
-
-}

src/de/craftinc/gates/commands/CommandUnhide.java

@@ -0,0 +1,58 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.commands;
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.ChatColor;
+
+import de.craftinc.gates.Plugin;
+
+
+public class CommandUnhide extends BaseCommand
+{
+	
+	public CommandUnhide()
+	{
+		aliases.add("unhide");
+		aliases.add("u");
+		
+		requiredParameters.add("id");		
+		
+		helpDescription = "Make that gate visible";
+		
+		requiredPermission = Plugin.permissionManage;
+		
+		needsPermissionAtCurrentLocation = false;
+		shouldPersistToDisk = true;
+		senderMustBePlayer = false;
+	}
+	
+	
+	public void perform() 
+	{
+		try 
+		{
+			gate.setHidden(false);
+            GateBlockChangeSender.updateGateBlocks(gate);
+			sendMessage(ChatColor.GREEN + "The gate " + gate.getId() + " is now visible.");
+		}
+		catch (Exception e) {
+			sendMessage(ChatColor.RED + e.getMessage());
+		}
+	}
+
+}

src/de/craftinc/gates/listeners/BaseLocationListener.java

@@ -1,97 +0,0 @@
-package de.craftinc.gates.listeners;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.event.player.PlayerMoveEvent;
-
-import de.craftinc.gates.Gate;
-
-
-public abstract class BaseLocationListener 
-{
-	protected Gate getValidGateAtPlayerLocation(PlayerMoveEvent e) {
-		Gate gate = null;
-		
-		Location playerLocation = e.getPlayer().getLocation();
-		World playerWorld = playerLocation.getWorld();
-		
-		Block blockTo = e.getFrom().getBlock();
-		Block blockToUp = blockTo.getRelative(BlockFace.UP);
-		
-		
-		for (Gate g : Gate.getAll()) {
-			// Check if the gate is open and useable
-			World gateWorld = g.getLocation().getWorld();
-			
-			if (g.isOpen() == false || !gateWorld.equals(playerWorld)) {
-				continue;
-			}
-			
-            
-			// Check if the location matches
-			for (Location l: g.getGateBlockLocations()) {
-				
-				if (locationsAreAtSamePositions(l, blockTo.getLocation()) || locationsAreAtSamePositions(l, blockToUp.getLocation())) {
-					// Check if the gate is still valid
-					try {
-						g.validate();
-						gate = g;
-	                    break;
-					} 
-					catch (Exception e2) {
-						// do nothing - gate is closed
-					}
-                }
-            }
-		}
-		
-		return gate;
-	}
-	
-	
-	protected Gate getGateAtPlayerLocation(PlayerMoveEvent e) {
-		Gate gate = null;
-		
-		Block blockTo = e.getFrom().getBlock();
-		Block blockToUp = blockTo.getRelative(BlockFace.UP);
-		
-		System.out.println(blockTo.getLocation().getWorld().getName());
-		
-		
-		for (Gate g : Gate.getAll()) {
-			// Check if the location matches
-			for (Location l: g.getGateBlockLocations()) {
-				
-				if (locationsAreAtSamePositions(l, blockTo.getLocation()) || locationsAreAtSamePositions(l, blockToUp.getLocation())) {
-					gate = g;
-                }
-            }
-		}
-		
-		return gate;
-	}
-	
-	
-	/**
-     * Does the same as the equal method of Location but ignores pitch and yaw.
-     */
-	protected boolean locationsAreAtSamePositions(final Location l1, final Location l2)
-    {
-		if (l1.getWorld() != l2.getWorld() && (l1.getWorld() == null || !l1.getWorld().equals(l2.getWorld()))) {
-			return false;
-        }
-		if (Double.doubleToLongBits(l1.getX()) != Double.doubleToLongBits(l2.getX())) {
-			return false;
-		}
-		if (Double.doubleToLongBits(l1.getY()) != Double.doubleToLongBits(l2.getY())) {
-			return false;
-		}
-		if (Double.doubleToLongBits(l1.getZ()) != Double.doubleToLongBits(l2.getZ())) {
-			return false;
-		}
-		
-		return true;
-    }
-}

src/de/craftinc/gates/listeners/BlockBreakListener.java

@@ -0,0 +1,48 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.listeners;
+
+
+import de.craftinc.gates.Gate;
+import de.craftinc.gates.Plugin;
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+
+public class BlockBreakListener implements Listener
+{
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onBlockBreak(BlockBreakEvent event)
+    {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        Gate gate = Plugin.getPlugin().getGatesManager().getGateAtFrameLocation(event.getBlock().getLocation());
+
+        if (gate != null && !gate.isHidden()) {
+            try {
+                gate.setOpen(false);
+            }
+            catch (Exception ignored) { }
+
+            GateBlockChangeSender.updateGateBlocks(gate);
+        }
+    }
+}

src/de/craftinc/gates/listeners/PlayerChangedWorldListener.java

@@ -0,0 +1,34 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.listeners;
+
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
+
+
+public class PlayerChangedWorldListener implements Listener
+{
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerChangeWorld(PlayerChangedWorldEvent event)
+    {
+        GateBlockChangeSender.updateGateBlocks(event.getPlayer());
+    }
+}

src/de/craftinc/gates/listeners/PlayerJoinListener.java

@@ -0,0 +1,33 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.listeners;
+
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+public class PlayerJoinListener implements Listener
+{
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerJoin(PlayerJoinEvent event)
+    {
+        GateBlockChangeSender.updateGateBlocks(event.getPlayer());
+    }
+}

src/de/craftinc/gates/listeners/PlayerMoveListener.java

@@ -0,0 +1,136 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.listeners;
+
+import java.util.Calendar;
+import java.util.HashMap;
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerMoveEvent;
+
+import de.craftinc.gates.Gate;
+import de.craftinc.gates.GatesManager;
+import de.craftinc.gates.Plugin;
+
+
+public class PlayerMoveListener implements Listener
+{
+	protected HashMap<String, Long> lastNoPermissionMessages = new HashMap<String, Long>();
+	
+	@EventHandler(priority = EventPriority.NORMAL)
+	public void onPlayerMove(PlayerMoveEvent event) 
+	{
+		if (event.isCancelled()) {
+			return;
+		}
+
+        if (event.getFrom().getChunk() != event.getTo().getChunk()) {
+            GateBlockChangeSender.updateGateBlocks(event.getPlayer(), event.getTo());
+        }
+
+		GatesManager gateManager = Plugin.getPlugin().getGatesManager();
+		Gate gateAtLocation = gateManager.getGateAtLocation(event.getTo());
+
+		if (gateAtLocation == null) {
+//            Location headTo = new Location(event.getTo().getWorld(),
+//                                           event.getTo().getX(),
+//                                           event.getTo().getY()+1.0,
+//                                           event.getTo().getZ());
+//
+//            gateAtLocation = gateManager.getGateAtLocation(headTo);
+
+//            if (gateAtLocation == null) {
+                return;
+//            }
+		}
+
+        if (!gateAtLocation.isOpen()) {
+            return;
+        }
+		
+		// Check for permission
+		if (!hasPermission(event.getPlayer(), gateAtLocation)
+            && Plugin.getPlugin().getConfig().getBoolean(Plugin.confShowTeleportNoPermissionMessageKey)) {
+			
+			String playerName = event.getPlayer().getName();
+			
+			if (playerName == null) {
+				return;
+			}
+	        
+	        // get the current time
+	        Long now = Calendar.getInstance().getTimeInMillis();
+			
+			// do not display messages more often than once per second
+			if (!this.lastNoPermissionMessages.containsKey(playerName) || this.lastNoPermissionMessages.get(playerName) < now - 10000L) {
+
+                String noPermissionString = Plugin.getPlugin().getConfig().getString(Plugin.confGateTeleportNoPermissionMessageKey);
+                event.getPlayer().sendMessage(ChatColor.RED + noPermissionString);
+				this.lastNoPermissionMessages.put(playerName, now);
+			}
+		}
+        else {
+            this.teleportPlayer(event.getPlayer(), gateAtLocation);
+        }
+	}
+
+
+    /**
+     * Teleports a player.
+     * @param p The player to teleport.
+     * @param g The gate to which exit the player will be teleported.
+     */
+	private void teleportPlayer(Player p, Gate g)
+	{
+        Float newYaw = g.getExit().getYaw() - g.getLocation().getYaw() + p.getLocation().getYaw();
+
+        Location destLocation = new Location( g.getExit().getWorld(),
+                                              g.getExit().getX(),
+                                              g.getExit().getY(),
+                                              g.getExit().getZ(),
+                                              newYaw,
+                                              p.getLocation().getPitch()
+                                            );
+
+        p.teleport(destLocation);
+
+        if (Plugin.getPlugin().getConfig().getBoolean(Plugin.confShowTeleportMessageKey)) {
+            String teleporMessage = Plugin.getPlugin().getConfig().getString(Plugin.confGateTeleportMessageKey);
+            p.sendMessage(ChatColor.DARK_AQUA + teleporMessage);
+        }
+	}
+	
+	
+	protected boolean hasPermission(Player player, Gate gate) 
+	{
+		if (Plugin.getPermission() == null) { // fallback: use the standard bukkit permission system
+			return player.hasPermission(Plugin.permissionUse);
+		}
+		else {
+			boolean permAtLocation = Plugin.getPermission().has(gate.getLocation().getWorld(), player.getName(), Plugin.permissionUse);
+			boolean permAtExit = Plugin.getPermission().has(gate.getExit().getWorld(), player.getName(), Plugin.permissionUse);
+			
+			return permAtLocation && permAtExit;
+		}
+    }
+}

src/de/craftinc/gates/listeners/PlayerRespawnListener.java

@@ -0,0 +1,34 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.listeners;
+
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerRespawnEvent;
+
+
+public class PlayerRespawnListener implements Listener
+{
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerRespawn(PlayerRespawnEvent event)
+    {
+        GateBlockChangeSender.updateGateBlocks(event.getPlayer(), event.getRespawnLocation(), true);
+    }
+}

src/de/craftinc/gates/listeners/PlayerTeleportListener.java

@@ -0,0 +1,37 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.listeners;
+
+
+import de.craftinc.gates.util.GateBlockChangeSender;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerTeleportEvent;
+
+public class PlayerTeleportListener implements Listener
+{
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerTeleport(PlayerTeleportEvent event)
+    {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        GateBlockChangeSender.updateGateBlocks(event.getPlayer(), event.getTo(), true);
+    }
+}

src/de/craftinc/gates/listeners/PluginBlockListener.java

@@ -1,51 +0,0 @@
-package de.craftinc.gates.listeners;
-
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockPhysicsEvent;
-
-
-
-
-public class PluginBlockListener implements Listener 
-{
-	@EventHandler(priority = EventPriority.NORMAL) 
-	public void onBlockPhysics(BlockPhysicsEvent event) 
-	{
-		if (event.isCancelled())
-			return;
-		
-		if (event.getBlock().getType() != Material.PORTAL) {
-			return;
-		}
-		
-		if (isBlockInPortal(event.getBlock())) {
-			event.setCancelled(true);
-		}
-	}
-	
-	public boolean isBlockInPortal(Block block) 
-	{
-		if (block.getRelative(BlockFace.UP).getType() == Material.AIR) {
-			return false;
-		}
-		
-		if (block.getRelative(BlockFace.DOWN).getType() == Material.AIR) {
-			return false;
-		}
-		
-		if ( block.getRelative(BlockFace.NORTH).getType() != Material.AIR && block.getRelative(BlockFace.SOUTH).getType() != Material.AIR ) {
-			return true;
-		}
-		
-		if ( block.getRelative(BlockFace.WEST).getType() != Material.AIR && block.getRelative(BlockFace.EAST).getType() != Material.AIR ) {
-			return true;
-		}
-		
-		return false;
-	}
-}

src/de/craftinc/gates/listeners/PluginPlayerListener.java

@@ -1,77 +0,0 @@
-package de.craftinc.gates.listeners;
-
-import java.util.logging.Level;
-
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerMoveEvent;
-
-import de.craftinc.gates.Gate;
-import de.craftinc.gates.Plugin;
-
-
-public class PluginPlayerListener extends BaseLocationListener implements Listener 
-{
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerMove(PlayerMoveEvent event) 
-	{
-		if (event.isCancelled()) {
-			return;
-		}
-		
-		// Check for permission
-		if (!hasPermission(event.getPlayer())) {
-			return;
-		}
-		
-		// Find the gate at the current location.
-		Gate gateAtLocation = getValidGateAtPlayerLocation(event);
-		
-		
-		if (gateAtLocation == null) {
-			return;
-		}
-		
-		// Teleport the player
-		checkChunkLoad(gateAtLocation.getLocation().getBlock());
-		
-		Location gateExit = gateAtLocation.getExit();
-		Location playerLocation = event.getPlayer().getLocation();
-		
-        Float newYaw = gateExit.getYaw() - gateExit.getYaw() + playerLocation.getYaw();
-        
-        Location teleportToLocation = new Location( gateExit.getWorld(),
-        											gateExit.getX(),
-        											gateExit.getY(),
-        											gateExit.getZ(),
-					                                newYaw, 
-					                                playerLocation.getPitch() );
-                    
-		event.getPlayer().teleport(teleportToLocation);
-		event.setTo(teleportToLocation);
-	}
-	
-	
-	private void checkChunkLoad(Block b) 
-	{
-		World w = b.getWorld();
-		Chunk c = b.getChunk();
-		
-		if ( ! w.isChunkLoaded(c) )
-		{
-		    Plugin.log(Level.FINE, "Loading chunk: " + c.toString() + " on: " + w.toString());
-			w.loadChunk(c);
-		}
-	}
-	
-	
-	protected boolean hasPermission(Player player) {
-        return player.hasPermission(Plugin.permissionUse) || player.hasPermission(Plugin.permissionAll);
-    }
-}

src/de/craftinc/gates/listeners/PluginPortalListener.java

@@ -1,27 +0,0 @@
-package de.craftinc.gates.listeners;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerPortalEvent;
-
-import de.craftinc.gates.Gate;
-
-public class PluginPortalListener extends BaseLocationListener implements Listener
-{
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerPortal(PlayerPortalEvent event)
-	{		
-		if (event.isCancelled()) {
-			return;
-		}
-		
-		// Find the gate at the current location.
-		Gate gateAtLocation = getGateAtPlayerLocation(event);
-		
-		if (gateAtLocation != null) {
-			event.setCancelled(true);
-		}
-	}
-
-}

src/de/craftinc/gates/persistence/LocationUtil.java

@@ -0,0 +1,100 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.persistence;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.bukkit.Location;
+import org.bukkit.World;
+
+import de.craftinc.gates.Plugin;
+
+
+public class LocationUtil 
+{
+	protected final static String worldKey = "world";
+	protected final static String xKey = "x";
+	protected final static String yKey = "y";
+	protected final static String zKey = "z";
+
+	
+	protected static World getWorld(final String name) throws Exception
+	{
+		if (name == null) {
+            throw new IllegalArgumentException("The name of the world must not be 'null");
+        }
+
+        World world = Plugin.getPlugin().getServer().getWorld(name);
+
+		if (world == null) {
+			throw new Exception("World '" + name + "' does not exists anymore! Cannot get instance!");
+		}
+		
+		return world;
+	}
+
+
+    /**
+     * Serializes a location. Helps storing locations inside yaml files. NOTE: We do not care about yaw
+     * and pitch for gate locations. So we won't serialize them.
+     *
+     * @param l The location to serialize. Supplying 'null' is ok..
+     * @return A Map object ready for storing inside a yaml file. Will return 'null' if 'l' is null.
+     */
+	public static Map<String, Object> serializeLocation(final Location l)
+	{
+		if (l == null) {
+			return null;
+		}
+		
+		Map<String, Object> serializedLocation = new HashMap<String, Object>();
+		
+		serializedLocation.put(worldKey, l.getWorld().getName());
+		serializedLocation.put(xKey, l.getX());
+		serializedLocation.put(yKey, l.getY());
+		serializedLocation.put(zKey, l.getZ());
+		
+		return serializedLocation;
+	}
+
+
+    /**
+     *
+     * @param map A map generated with the 'serializeLocation' method. Supplying 'null' is ok.
+     * @return A deserialized location. This method will return 'null' if 'map' is null!
+     * @throws Exception This method will throw an exception if the world of the supplied serialized location
+     *         does not exist or if 'map' does not contain all necessary keys!
+     */
+	public static Location deserializeLocation(final Map<String, Object> map) throws Exception
+	{
+		if (map == null) {
+			return null;
+		}
+		
+		World w = getWorld((String)map.get(worldKey));
+
+		Number x =  (Number)map.get(xKey);
+        Number y =  (Number)map.get(yKey);
+        Number z =  (Number)map.get(zKey);
+
+        if (x == null || y == null || z == null) {
+            throw new IllegalArgumentException("Supplied map is invalid x, y or z coordinate was not supplied");
+        }
+		
+		return new Location(w, x.doubleValue(), y.doubleValue(), z.doubleValue());
+	}
+}

src/de/craftinc/gates/persistence/MigrationUtil.java

@@ -0,0 +1,54 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.persistence;
+
+import de.craftinc.gates.Gate;
+
+import de.craftinc.gates.Plugin;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+
+import java.util.List;
+import java.util.logging.Level;
+
+
+public class MigrationUtil
+{
+    public static boolean performMigration(int storageVersion, int currentVersion, List<Gate> gates)
+    {
+        if (currentVersion == 1 && storageVersion == 0) {
+
+            for (Gate g : gates) {
+
+                for (Location l : g.getGateBlockLocations()) {
+                    Block b = l.getBlock();
+
+                    if (b.getType() == Material.PORTAL) {
+                        b.setType(Material.AIR);
+                    }
+                }
+            }
+
+            return true;
+        }
+        else {
+            Plugin.log(Level.SEVERE, "Supplied storage version is currently not supported! Make sure you have the latest version of Craft Inc. Gates installed. Plugin will be disabled!");
+            return false;
+        }
+    }
+}

src/de/craftinc/gates/util/FloodUtil.java

@@ -1,9 +1,26 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates.util;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Level;
 
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -13,10 +30,8 @@ import de.craftinc.gates.Plugin;
 
 public class FloodUtil 
 {
-	private final static int frameBlockSearchLimit = 20;
+	protected static final Set<BlockFace> exp1 = new HashSet<BlockFace>();
-	
+    protected static final Set<BlockFace> exp2 = new HashSet<BlockFace>();
-	private static final Set<BlockFace> exp1 = new HashSet<BlockFace>();
-	private static final Set<BlockFace> exp2 = new HashSet<BlockFace>();
 	
 	static 
 	{
@@ -32,10 +47,110 @@ public class FloodUtil
 	}
 
 
+    /**
+     * Returns the all frame blocks of an gate.
+     * @param blocks All blocks inside the gate.
+     * @return A Set containing all frame block. Will never return 'null'.
+     */
+    public static Set<Block> getFrame(final Set<Block> blocks)
+    {
+        if (blocks == null || blocks.isEmpty()) {
+            return new HashSet<Block>();
+        }
+
+        // try to find gate's direction (north-south or east-west)
+        Set<BlockFace> gateFrameSearchFaces = null;
+
+        for (Block b : blocks) {
+
+            if (blocks.contains(b.getRelative(BlockFace.EAST)) ||
+                blocks.contains(b.getRelative(BlockFace.WEST))) {
+
+                gateFrameSearchFaces = exp1;
+                break;
+            }
+
+            if (blocks.contains(b.getRelative(BlockFace.NORTH)) ||
+                    blocks.contains(b.getRelative(BlockFace.SOUTH))) {
+
+                gateFrameSearchFaces = exp2;
+                break;
+            }
+
+        }
+
+        if (gateFrameSearchFaces != null) {
+            return _getFrame(blocks, gateFrameSearchFaces);
+        }
+        else { // no direction found (the gate might only consist of blocks one over another)
+
+            // Try one direction and check if the found blocks are not air.
+            // If air is found (frame broken or wrong direction) return the other direction
+            Set<Block> frameBlocks = _getFrame(blocks, exp1);
+
+            for (Block b : frameBlocks) {
+
+                if (b.getType() == Material.AIR) {
+                    return _getFrame(blocks, exp2);
+                }
+            }
+
+            return frameBlocks;
+        }
+    }
+
+
+
+    protected static Set<Block> _getFrame(final Set<Block> blocks, final Set<BlockFace> searchDirections)
+    {
+        Set<Block> frameBlocks = new HashSet<Block>();
+
+        for (Block b : blocks) {
+
+            for (BlockFace bf : searchDirections) {
+                Block bb = b.getRelative(bf);
+
+                if (!blocks.contains(bb)) {
+                    frameBlocks.add(bb);
+                }
+            }
+        }
+
+        return frameBlocks;
+    }
+
+
+    /**
+     * Returns the all frame blocks of an gate.
+     * @param locations All locations inside the gate.
+     * @return A Set containing all frame block. Will never return 'null'.
+     */
+    public static Set<Block> getFrameWithLocations(final Set<Location> locations)
+    {
+        if (locations == null) {
+            throw new IllegalArgumentException("'locations' must not be 'null'");
+        }
+
+        Set<Block> blocks = new HashSet<Block>();
+
+        for (Location l : locations) {
+            blocks.add(l.getBlock());
+        }
+
+        return getFrame(blocks);
+    }
+
+	
 	// For the same frame and location this set of blocks is deterministic
-	public static Set<Block> getGateFrameBlocks(Block block) 
+	public static Set<Block> getGatePortalBlocks(final Block block)
 	{
-		Set<Block> blocks1 = getAirFloodBlocks(block, new HashSet<Block>(), exp1, frameBlockSearchLimit);
+        if (block == null) {
+            throw new IllegalArgumentException("'block' must not be 'null'");
+        }
+
+        int frameBlockSearchLimit = Plugin.getPlugin().getConfig().getInt(Plugin.confMaxGateBlocksKey);
+
+        Set<Block> blocks1 = getAirFloodBlocks(block, new HashSet<Block>(), exp1, frameBlockSearchLimit);
 		Set<Block> blocks2 = getAirFloodBlocks(block, new HashSet<Block>(), exp2, frameBlockSearchLimit);
 		
 		if (blocks1 == null && blocks2 == null) {
@@ -58,28 +173,30 @@ public class FloodUtil
 	}
 
 
-	public static Set<Block> getAirFloodBlocks(Block startBlock, Set<Block> foundBlocks, Set<BlockFace> expandFaces, int limit) 
+    protected static Set<Block> getAirFloodBlocks(final Block           startBlock,
+                                                        Set<Block>      foundBlocks,
+                                                  final Set<BlockFace>  expandFaces,
+                                                        int             limit)
 	{
-		if (foundBlocks == null)
+		if (foundBlocks == null) {
 			return null;
+		}
 		
-		if  (foundBlocks.size() > limit) 
+		if  (foundBlocks.size() > limit) {
-		{
 			Plugin.log(Level.ALL, "exceeding gate size limit.");
 			return null;
 		}
 		
-		if (foundBlocks.contains(startBlock)) 
+		if (foundBlocks.contains(startBlock))  {
 			return foundBlocks;
+        }
 		
-		if (startBlock.getType() == Material.AIR || startBlock.getType() == Material.PORTAL) 
+		if (startBlock.getType() == Material.AIR) {
-		{
 			// ... We found a block :D ...
 			foundBlocks.add(startBlock);
 			
 			// ... And flood away !
-			for (BlockFace face : expandFaces) 
+			for (BlockFace face : expandFaces) {
-			{
 				Block potentialBlock = startBlock.getRelative(face);
 				foundBlocks = getAirFloodBlocks(potentialBlock, foundBlocks, expandFaces, limit);
 			}
@@ -87,5 +204,4 @@ public class FloodUtil
 		
 		return foundBlocks;
 	}
-	
 }

src/de/craftinc/gates/util/GateBlockChangeSender.java

@@ -0,0 +1,157 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.util;
+
+
+import de.craftinc.gates.Plugin;
+import de.craftinc.gates.Gate;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+
+public class GateBlockChangeSender
+{
+    /**
+     * Sends gate blocks to player at a given location. Will send the updates either immediately or
+     * immediately and after a short delay.
+     * @param player      A player to send block changes to. Must not be null!
+     * @param location    The location to look for gates nearby. Must not be null!
+     * @param sendDelayed Set to 'true' if the block changes shall be send a second time after a one
+     *                    second delay.
+     */
+    public static void updateGateBlocks(final Player player, final Location location, boolean sendDelayed)
+    {
+        if (player == null) {
+            throw new IllegalArgumentException("'player' must not be 'null'!");
+        }
+
+        if (location == null) {
+            throw new IllegalArgumentException("'location' must not be 'null'!");
+        }
+
+        Set<Gate> gatesNearby = Plugin.getPlugin().getGatesManager().getNearbyGates(location.getChunk());
+
+        if (gatesNearby == null) {
+            return; // no gates nearby
+        }
+
+        for (Gate g : gatesNearby) {
+
+            if (!g.isOpen() || g.isHidden()) {
+                continue;
+            }
+
+            for (Location l : g.getGateBlockLocations()) {
+
+                if (l.getBlock().getType() == Material.AIR) {
+                    player.sendBlockChange(l, Material.PORTAL, (byte)0);
+                }
+            }
+        }
+
+        if (sendDelayed) {
+            Bukkit.getScheduler().scheduleSyncDelayedTask(Plugin.getPlugin(), new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    updateGateBlocks(player, location, false);
+                }
+            }, 20L);
+        }
+    }
+
+
+    /**
+     * This method calls: updateGateBlocks(player, location, false);
+     */
+    public static void updateGateBlocks(final Player player, final Location location)
+    {
+        updateGateBlocks(player, location, false);
+    }
+
+    /**
+     * This method calls: updateGateBlocks(player, player.getLocation(), false);
+     */
+    public static void updateGateBlocks(final Player player)
+    {
+        if (player == null) {
+            throw new IllegalArgumentException("'player' must not be 'null'!");
+        }
+
+        updateGateBlocks(player, player.getLocation(), false);
+    }
+
+
+    public static void updateGateBlocks(final Gate gate)
+    {
+        updateGateBlocks(gate, false);
+    }
+
+    /**
+     * Sends block changes to players near a given gate.
+     * @param gate Must not be 'null'!
+     * @param remove Set to true if all visible gate blocks shall be removed.
+     */
+    public static void updateGateBlocks(final Gate gate, boolean remove)
+    {
+        if (gate == null) {
+            throw new IllegalArgumentException("'gate must not be 'null'!");
+        }
+
+        Location gateLocation = gate.getLocation();
+
+        if (gate.getGateBlockLocations().isEmpty()) {
+            return;
+        }
+
+        ArrayList<Player> playersNearby = new ArrayList<Player>();
+
+        int searchRadius = Plugin.getPlugin().getConfig().getInt(Plugin.confPlayerGateBlockUpdateRadiusKey);
+
+        for (Player p : Plugin.getPlugin().getServer().getOnlinePlayers()) {
+
+            if (p.getWorld() == gateLocation.getWorld() && p.getLocation().distance(gateLocation) < searchRadius) {
+                playersNearby.add(p);
+            }
+        }
+
+        Material material;
+
+        if (gate.isOpen() && !gate.isHidden() && !remove) {
+            material = Material.PORTAL;
+        }
+        else {
+            material = Material.AIR;
+        }
+
+        for (Player p : playersNearby) {
+
+            for (Location l : gate.getGateBlockLocations()) {
+
+                if (l.getBlock().getType() == Material.AIR) { // on server-side a gate is always made out of AIR
+                    p.sendBlockChange(l, material, (byte)0);
+                }
+            }
+        }
+    }
+}

src/de/craftinc/gates/util/GeometryUtil.java

@@ -1,15 +0,0 @@
-package de.craftinc.gates.util;
-
-import org.bukkit.Location;
-
-public class GeometryUtil {
-	
-	// How long between two locations?
-	public static double distanceBetweenLocations(Location location1, Location location2) {
-		double X = location1.getX() - location2.getX();
-		double Y = location1.getY() - location2.getY();
-		double Z = location1.getZ() - location2.getZ();
-		return Math.sqrt(X*X+Y*Y+Z*Z);
-	}
-	
-}

src/de/craftinc/gates/util/LocationSerializer.java

@@ -1,86 +0,0 @@
-package de.craftinc.gates.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-
-import de.craftinc.gates.Plugin;
-
-
-/**
- * NOTE: We do not care about yaw and pitch for gate locations. So we won't serialize them.
- */
-public class LocationSerializer 
-{
-	protected static String worldKey = "world";
-	protected static String xKey = "x";
-	protected static String yKey = "y";
-	protected static String zKey = "z";
-
-	
-	protected static World getWorld(String name) throws Exception 
-	{
-		World world = Plugin.instance.getServer().getWorld(name);
-
-		if (world == null) {
-			throw new Exception("World '" + name + "' does not exists anymore! Cannot get instance!");
-		}
-		
-		return world;
-	}
-	
-	
-	public static Map<String, Object> serializeLocation(Location l)
-	{
-		if (l == null) {
-			return null;
-		}
-		
-		Map<String, Object> serializedLocation = new HashMap<String, Object>();
-		
-		serializedLocation.put(worldKey, l.getWorld().getName());
-		serializedLocation.put(xKey, l.getX());
-		serializedLocation.put(yKey, l.getY());
-		serializedLocation.put(zKey, l.getZ());
-		
-		return serializedLocation;
-	}
-	
-
-	public static Location deserializeLocation(Map<String, Object> map) throws Exception
-	{
-		if (map == null) {
-			return null;
-		}
-		
-		World w = getWorld((String)map.get(worldKey));
-		
-		
-		// verbose loading of coordinates (they might be Double or Integer)
-		Object objX =  map.get(xKey);
-		Object objY =  map.get(yKey);
-		Object objZ =  map.get(zKey);
-		
-		double x,y,z;
-		
-		if (objX instanceof Integer)
-			x = (double)(Integer)objX;
-		else
-			x = (Double)objX;
-		
-		if (objY instanceof Integer)
-			y = (double)(Integer)objY;
-		else
-			y = (Double)objY;
-		
-		if (objZ instanceof Integer)
-			z = (double)(Integer)objZ;
-		else
-			z = (Double)objZ;
-		
-		
-		return new Location(w, x, y, z);
-	}
-}

src/de/craftinc/gates/util/SimpleChunk.java

@@ -0,0 +1,79 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.util;
+
+import org.bukkit.Chunk;
+import org.bukkit.World;
+
+public class SimpleChunk 
+{
+	private int x;
+	private int z;
+	private String world;
+	
+	public SimpleChunk(Chunk c)
+	{
+		this.x = c.getX();
+		this.z = c.getZ();
+		this.world = c.getWorld().getName();
+	}
+
+
+    public SimpleChunk(int x, int z, World w)
+    {
+        this.x = x;
+        this.z = z;
+        this.world = w.getName();
+    }
+
+	
+	@Override
+    public boolean equals(Object o)
+    {
+    	if (o instanceof SimpleChunk) {
+    		SimpleChunk otherLocation = (SimpleChunk)o;
+    		
+    		if (otherLocation.x == this.x 
+    			&& otherLocation.z == this.z 
+    			&& otherLocation.world.equals(this.world)) {
+    			
+    			return true;
+    		}
+    	}
+    	
+    	return false;
+    }
+
+	
+    @Override
+    public int hashCode()
+    {
+    	int hash = 11;
+    	hash = 29 * hash + x;
+    	hash = 37 * hash + z;
+    	hash = 29 * hash + world.hashCode();
+    	
+    	return hash;
+    }
+
+
+    @Override
+    public String toString()
+    {
+        return this.getClass().toString() + " (x=" + this.x + " z=" + this.z + " world='" + this.world + "')";
+    }
+}

src/de/craftinc/gates/util/SimpleLocation.java

@@ -0,0 +1,95 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
+package de.craftinc.gates.util;
+
+import org.bukkit.Location;
+
+public class SimpleLocation 
+{
+	private String world;
+    private int x;
+    private int y;
+    private int z;
+    
+    
+    public SimpleLocation(Location l)
+    {
+    	this.world = l.getWorld().getName();
+
+        // Using Block coordinates makes it possible to compare block locations with player locations.
+        // There might be an offset of 1 otherwise.
+    	this.x = l.getBlockX();
+    	this.y = l.getBlockY();
+    	this.z = l.getBlockZ();
+    }
+
+
+    public SimpleLocation(Location l, boolean isHeadPosition)
+    {
+        this.world = l.getWorld().getName();
+
+        // Using Block coordinates makes it possible to compare block locations with player locations.
+        // There might be an offset of 1 otherwise.
+        this.x = l.getBlockX();
+        this.y = l.getBlockY();
+        this.z = l.getBlockZ();
+
+        if (isHeadPosition) {
+            this.y--;
+        }
+    }
+
+
+    @Override
+    public String toString()
+    {
+        return super.toString() + " x: " + x + " y: " + y + " z: " + z + " world: " + world;
+    }
+
+    
+    
+    @Override
+    public boolean equals(final Object o)
+    {
+    	if (o instanceof SimpleLocation) {
+    		SimpleLocation otherLocation = (SimpleLocation)o;
+    		
+    		if (otherLocation.x == this.x 
+    			&& otherLocation.y == this.y 
+    			&& otherLocation.z == this.z 
+    			&& otherLocation.world.equals(this.world)) {
+    			
+    			return true;
+    		}
+    	}
+    	
+    	return false;
+    }
+
+    
+    @Override
+    public int hashCode()
+    {
+    	int hash = 13;
+    	hash = 37 * hash + x;
+    	hash = 31 * hash + y;
+    	hash = 37 * hash + z;
+    	hash = 31 * hash + world.hashCode();
+    	
+    	return hash;
+    }
+}

src/de/craftinc/gates/util/TextUtil.java

@@ -1,9 +1,24 @@
+/*  Craft Inc. Gates
+    Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program (LGPLv3).  If not, see <http://www.gnu.org/licenses/>.
+*/
 package de.craftinc.gates.util;
 
-import java.util.List;
-
 import org.bukkit.ChatColor;
-import org.bukkit.Material;
+
+import java.util.List;
 
 public class TextUtil 
 {
@@ -29,7 +44,7 @@ public class TextUtil
 	
 	
 	/**
-	 * Joins all emements of list into a single string, sperating the original strings with glue.
+	 * Joins all elements of list into a single string, separating the original strings with glue.
 	 */
 	public static String implode(List<String> list, String glue)
 	{
@@ -45,24 +60,6 @@ public class TextUtil
 	    
 	    return ret;
 	}
-	
-	/**
-	 * Joins all emements of list into a single string.
-	 */
-	public static String implode(List<String> list) {
-		return implode(list, "");
-	}
-	
-	
-	
-	public static String getMaterialName(Material material) 
-	{
-		String ret = material.toString();
-		ret = ret.replace('_', ' ');
-		ret = ret.toLowerCase();
-		
-		return ret.substring(0, 1).toUpperCase() + ret.substring(1);
-	}
 }