From d448eb0f85c48322c22a44f115eba111f05cca17 Mon Sep 17 00:00:00 2001
From: Jascha Starke <jascha@ja-s.de>
Date: Fri, 13 Apr 2012 18:53:31 +0200
Subject: [PATCH] v1.2.3-beta:  - reverted xAuth session test  - closing
 inventory on GM-Switch  - fixed multiverse world teleport issue (by removing
 an not longer needed workaround)

---
 plugin.yml                                                 | 2 +-
 pom.xml                                                    | 4 ++--
 src/de/jaschastarke/minecraft/integration/xAuth.java       | 2 --
 .../jaschastarke/minecraft/limitedcreative/LCPlayer.java   | 7 ++-----
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/plugin.yml b/plugin.yml
index b0c1c3f..958afac 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,6 +1,6 @@
 name: LimitedCreative
 main: de.jaschastarke.minecraft.limitedcreative.Core
-version: 1.2.1-alpha
+version: 1.2.3-alpha
 softdepend: [WorldGuard, WorldEdit, MultiInv]
 dev-url: http://dev.bukkit.org/server-mods/limited-creative/
 commands:
diff --git a/pom.xml b/pom.xml
index eb9cbf0..772a8f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,12 +68,12 @@
   	<dependency>
   		<groupId>org.bukkit</groupId>
   		<artifactId>bukkit</artifactId>
-  		<version>1.2.3-R0.2-SNAPSHOT</version>
+  		<version>1.2.5-R1.0</version>
   	</dependency>
   	<dependency>
   		<groupId>com.sk89q</groupId>
   		<artifactId>worldguard</artifactId>
-  		<version>5.5.2-SNAPSHOT</version>
+  		<version>5.5.2</version>
   	</dependency>
   	<dependency>
   		<groupId>uk.org.whoami</groupId>
diff --git a/src/de/jaschastarke/minecraft/integration/xAuth.java b/src/de/jaschastarke/minecraft/integration/xAuth.java
index 774cb11..05bc96c 100644
--- a/src/de/jaschastarke/minecraft/integration/xAuth.java
+++ b/src/de/jaschastarke/minecraft/integration/xAuth.java
@@ -32,8 +32,6 @@ public class xAuth implements CommunicationBridge {
             li = false;
         else if (xpl.isGuest())
             li = false;
-        else if (!getAuth().getPlyrMngr().checkSession(xpl))
-            li = false;
         Core.debug("xAuth: "+player.getName()+": logged in not guest: "+li);
         return li;
     }
diff --git a/src/de/jaschastarke/minecraft/limitedcreative/LCPlayer.java b/src/de/jaschastarke/minecraft/limitedcreative/LCPlayer.java
index f9512df..c13e12a 100644
--- a/src/de/jaschastarke/minecraft/limitedcreative/LCPlayer.java
+++ b/src/de/jaschastarke/minecraft/limitedcreative/LCPlayer.java
@@ -194,6 +194,7 @@ public class LCPlayer {
         if (plugin.config.getStoreEnabled()) {
             if (plugin.config.getPermissionToKeepInventory() && hasPermission(Perms.KEEPINVENTORY))
                 return true;
+            getPlayer().closeInventory();
             if (gm != GameMode.CREATIVE || plugin.config.getStoreCreative())
                 getInv().save();
             if (gm == GameMode.CREATIVE) {
@@ -425,11 +426,7 @@ public class LCPlayer {
             // result: change him back to default mode
             if (checkSwitchFlight(area_event)) {
                 storeActiveRegionGameMode(null);
-                if (event == null || event.getTo().getWorld() == event.getFrom().getWorld() || !plugin.com.isMultiVerse()) {
-                    // do not enforce the game mode change, on world teleport, as multiverse may cancel the event afterwards
-                    // the world-change game-mode change is done by multiworld
-                    getPlayer().setGameMode(DEFAULT_GAMEMODE);
-                }
+                getPlayer().setGameMode(DEFAULT_GAMEMODE);
             }
         } else if (region_gamemode == null && this.isActiveRegionGameMode()) {
             Core.debug(getName()+": leaving creative area (while already in default gamemode)");