v0.94.4.68 - fixed not giving rewards to spectators when they leave
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
name: MobArena
|
name: MobArena
|
||||||
author: garbagemule
|
author: garbagemule
|
||||||
main: com.garbagemule.MobArena.MobArena
|
main: com.garbagemule.MobArena.MobArena
|
||||||
version: 0.94.4.67
|
version: 0.94.4.68
|
||||||
softdepend: [Spout,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells,Vault]
|
softdepend: [Spout,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells,Vault]
|
||||||
commands:
|
commands:
|
||||||
ma:
|
ma:
|
||||||
|
|||||||
@@ -601,14 +601,11 @@ public class ArenaImpl implements Arena
|
|||||||
if (logging)
|
if (logging)
|
||||||
if (ap != null && running)
|
if (ap != null && running)
|
||||||
log.playerDeath(ap);
|
log.playerDeath(ap);
|
||||||
|
|
||||||
|
restoreInvAndExp(p);
|
||||||
if (inLobby(p) || inArena(p)) {
|
if (inLobby(p) || inArena(p)) {
|
||||||
restoreInvAndExp(p);
|
|
||||||
refund(p);
|
refund(p);
|
||||||
}
|
}
|
||||||
else if (inSpec(p)) {
|
|
||||||
inventoryManager.restoreInventory(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
movePlayerToEntry(p);
|
movePlayerToEntry(p);
|
||||||
discardPlayer(p);
|
discardPlayer(p);
|
||||||
@@ -661,7 +658,6 @@ public class ArenaImpl implements Arena
|
|||||||
|
|
||||||
if (settings.getBoolean("spectate-on-death", true)) {
|
if (settings.getBoolean("spectate-on-death", true)) {
|
||||||
movePlayerToSpec(p);
|
movePlayerToSpec(p);
|
||||||
//TODO revert if people throw a fit. Should help deter removing valuables from the arena
|
|
||||||
Messenger.tellPlayer(p, Msg.SPEC_FROM_ARENA);
|
Messenger.tellPlayer(p, Msg.SPEC_FROM_ARENA);
|
||||||
Messenger.tellPlayer(p, Msg.MISC_MA_LEAVE_REMINDER);
|
Messenger.tellPlayer(p, Msg.MISC_MA_LEAVE_REMINDER);
|
||||||
//restoreInvAndExp(p);
|
//restoreInvAndExp(p);
|
||||||
|
|||||||
Reference in New Issue
Block a user