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)
This commit is contained in:
parent
bcacf3e894
commit
d448eb0f85
4 changed files with 5 additions and 10 deletions
|
@ -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:
|
||||
|
|
4
pom.xml
4
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>
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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,12 +426,8 @@ 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);
|
||||
}
|
||||
}
|
||||
} else if (region_gamemode == null && this.isActiveRegionGameMode()) {
|
||||
Core.debug(getName()+": leaving creative area (while already in default gamemode)");
|
||||
// 1. the region doesn't allow "the other gamemode"
|
||||
|
|
Loading…
Reference in a new issue