Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-27 04:55:25 +01:00
Code Issues Projects Releases Wiki Activity

Attempt to fix multiworld inventory issues.

Browse Source
This commit is contained in:
garbagemule 2013-07-30 23:37:03 +02:00
parent 13948e7554
commit f43293a376
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/plugin.yml
View File

@ -1,7 +1,7 @@
name: MobArena
author: garbagemule
main: com.garbagemule.MobArena.MobArena
version: 0.95.5.4
version: 0.95.5.5
softdepend: [Spout,Towny,Heroes,MagicSpells,Vault]
commands:
ma:

4
src/com/garbagemule/MobArena/ArenaImpl.java
View File

@ -569,6 +569,7 @@ public class ArenaImpl implements Arena
}
}
movePlayerToLobby(p);
takeFee(p);
storePlayerData(p, loc);
removePotionEffects(p);
@ -580,7 +581,6 @@ public class ArenaImpl implements Arena
p.setExp(0.0f);
}
p.setGameMode(GameMode.SURVIVAL);
movePlayerToLobby(p);
arenaPlayerMap.put(p, new ArenaPlayer(p, this, plugin));
@ -826,7 +826,7 @@ public class ArenaImpl implements Arena
// If there's no player stored, create a new one!
if (mp == null) {
mp = new PlayerData(p);
mp = new PlayerData(p, loc);
playerData.put(p, mp);
}

4
src/com/garbagemule/MobArena/PlayerData.java
View File

@ -18,11 +18,11 @@ public class PlayerData
private Location entry = null;
private Collection<PotionEffect> potions;
public PlayerData(Player player) {
public PlayerData(Player player, Location loc) {
this.player = player;
this.mode = player.getGameMode();
this.entry = player.getLocation();
this.potions = player.getActivePotionEffects();
this.entry = loc;
update();
}