ChromaGaming/LimitedCreative
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases 2 Packages Wiki Activity

v1.2.3-beta:

Browse source 
- 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:
Jascha Starke 2012-04-13 18:53:31 +02:00
parent bcacf3e894
commit d448eb0f85
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugin.yml
View file

@ -1,6 +1,6 @@
name: LimitedCreative name: LimitedCreative
main: de.jaschastarke.minecraft.limitedcreative.Core main: de.jaschastarke.minecraft.limitedcreative.Core
version: 1.2.1-alpha version: 1.2.3-alpha
softdepend: [WorldGuard, WorldEdit, MultiInv] softdepend: [WorldGuard, WorldEdit, MultiInv]
dev-url: http://dev.bukkit.org/server-mods/limited-creative/ dev-url: http://dev.bukkit.org/server-mods/limited-creative/
commands: commands:

4
pom.xml
View file

@ -68,12 +68,12 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.2.3-R0.2-SNAPSHOT</version> <version>1.2.5-R1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId> <artifactId>worldguard</artifactId>
<version>5.5.2-SNAPSHOT</version> <version>5.5.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>uk.org.whoami</groupId> <groupId>uk.org.whoami</groupId>

2
src/de/jaschastarke/minecraft/integration/xAuth.java
View file

@ -32,8 +32,6 @@ public class xAuth implements CommunicationBridge {
li = false; li = false;
else if (xpl.isGuest()) else if (xpl.isGuest())
li = false; li = false;
else if (!getAuth().getPlyrMngr().checkSession(xpl))
li = false;
Core.debug("xAuth: "+player.getName()+": logged in not guest: "+li); Core.debug("xAuth: "+player.getName()+": logged in not guest: "+li);
return li; return li;
} }

5
src/de/jaschastarke/minecraft/limitedcreative/LCPlayer.java
View file

@ -194,6 +194,7 @@ public class LCPlayer {
if (plugin.config.getStoreEnabled()) { if (plugin.config.getStoreEnabled()) {
if (plugin.config.getPermissionToKeepInventory() && hasPermission(Perms.KEEPINVENTORY)) if (plugin.config.getPermissionToKeepInventory() && hasPermission(Perms.KEEPINVENTORY))
return true; return true;
getPlayer().closeInventory();
if (gm != GameMode.CREATIVE || plugin.config.getStoreCreative()) if (gm != GameMode.CREATIVE || plugin.config.getStoreCreative())
getInv().save(); getInv().save();
if (gm == GameMode.CREATIVE) { if (gm == GameMode.CREATIVE) {
@ -425,12 +426,8 @@ public class LCPlayer {
// result: change him back to default mode // result: change him back to default mode
if (checkSwitchFlight(area_event)) { if (checkSwitchFlight(area_event)) {
storeActiveRegionGameMode(null); 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()) { } else if (region_gamemode == null && this.isActiveRegionGameMode()) {
Core.debug(getName()+": leaving creative area (while already in default gamemode)"); Core.debug(getName()+": leaving creative area (while already in default gamemode)");
// 1. the region doesn't allow "the other gamemode" // 1. the region doesn't allow "the other gamemode"