--- miscJava/bukkit-minecraft-plugins/CreativeWorld/src/dk/thoerup/bukkit/creativeworld/WorldChanged.java	2011/12/10 19:33:19	1657
+++ miscJava/bukkit-minecraft-plugins/CreativeWorld/src/dk/thoerup/bukkit/creativeworld/WorldChanged.java	2012/01/26 19:01:52	1682
@@ -2,18 +2,34 @@
 
 import org.bukkit.*;
 import org.bukkit.entity.*;
+import org.bukkit.event.*;
 import org.bukkit.event.player.*;
 import org.bukkit.configuration.*;
 import org.bukkit.inventory.*;
 
-public class WorldChanged extends PlayerListener {
+public class WorldChanged implements Listener {
+	final static String STACK_TYPE = ".type";
+	final static String STACK_AMOUNT = ".amount";
+	final static String STACK_DAMAGE = ".damage";
+	final static String STACK_DATA = ".data";
+
+	final static String INVENTORY_CREATIVE = ".inventory.creative.";
+	final static String INVENTORY_CREATIVE_ARMOR = ".inventory.creative.armor.";
 
 	CreativeMain plugin;
 	public WorldChanged(CreativeMain plugin) {
 		this.plugin = plugin;
 	}
 
-	@Override
+
+	@EventHandler
+	public void onPlayerExpChange(PlayerExpChangeEvent event) {
+		if (event.getPlayer().getWorld().getName().equalsIgnoreCase("creative")) {
+			event.setAmount(0); //users don't acummulate xp points in creative mode
+		}	
+	}
+
+	@EventHandler
 	public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
 
 
@@ -30,14 +46,14 @@
 			PlayerInventory inv = player.getInventory();
 
 			for (int i=0; i<inv.getSize(); i++) {
-				String node =  player.getName() + ".inventory.creative." + i;;
+				String node =  player.getName() + INVENTORY_CREATIVE + i;;
 				//config.set( node, inv.getItem(i) );
 				saveItemStack(config, node, inv.getItem(i) );
 			}
 
 			ItemStack armor[] = inv.getArmorContents();
 			for (int i=0; i<armor.length; i++) {
-				String node =  player.getName() + ".inventory.creative.armor." + i;;
+				String node =  player.getName() + INVENTORY_CREATIVE_ARMOR + i;;
 				//config.set( node, armor[i] );
 				saveItemStack(config, node, armor[i] );
 			}
@@ -59,7 +75,7 @@
 			ItemStack items[] = new ItemStack[ inv.getSize() ];
 
 			for (int i=0; i<inv.getSize(); i++) {
-				String node =  player.getName() + ".inventory.creative." + i;;
+				String node =  player.getName() + INVENTORY_CREATIVE + i;;
 				//items[i] = config.getItemStack(node);
 				items[i] = getItemStack(config, node);
 			}
@@ -68,7 +84,7 @@
 
 			ItemStack armor[] = new ItemStack[  inv.getArmorContents().length];
 			for (int i=0; i<armor.length; i++) {
-				String node =  player.getName() + ".inventory.creative.armor." + i;
+				String node =  player.getName() + INVENTORY_CREATIVE_ARMOR + i;
 				//armor[i] = config.getItemStack(node);
 				armor[i] = getItemStack(config, node);
 			}
@@ -80,19 +96,21 @@
 
 
 	public void saveItemStack(Configuration config, String node, ItemStack stack) {
-		config.set(node + ".type", stack.getTypeId() );
-		config.set(node + ".amount", stack.getAmount() );
-		config.set(node + ".damage", (int)stack.getDurability() );
-		config.set(node + ".data", (int)stack.getData().getData() );
+		config.set(node + STACK_TYPE, stack.getTypeId() );
+		config.set(node + STACK_AMOUNT, stack.getAmount() );
+		config.set(node + STACK_DAMAGE, (int)stack.getDurability() );
+		config.set(node + STACK_DATA, (int)stack.getData().getData() );
 	}
 
 	public ItemStack getItemStack(Configuration config, String node) {
-		int type = config.getInt( node + ".type");
-		int amount = config.getInt( node + ".amount");
-		short damage = (short) config.getInt(node + ".damage");
-		byte data = (byte) config.getInt(node + ".data");
-
-		return new ItemStack(type,amount,damage,data);
+		int type = config.getInt( node + STACK_TYPE);
+		int amount = config.getInt( node + STACK_AMOUNT);
+		short damage = (short) config.getInt(node + STACK_DAMAGE);
+		byte data = (byte) config.getInt(node + STACK_DATA);
+
+		ItemStack stack = new ItemStack(type,amount,damage,data);
+		stack.setDurability( damage ); //ItemStack constructor with Data value overrides durability 
+		return stack; 
 	}
 	
 }