Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2025-02-04 22:51:20 +01:00
Code Issues Projects Releases Wiki Activity

v0.94.4.74 - more ClassLimitManager stuff, needs more work

Browse Source
This commit is contained in:
Brian 2012-06-29 21:36:41 -04:00
parent dd2ec4c157
commit 33199aa05e
4 changed files with 33 additions and 4 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.94.4.73
version: 0.94.4.74
softdepend: [Spout,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells,Vault]
commands:
ma:

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

@ -623,6 +623,12 @@ public class ArenaImpl implements Arena
refund(p);
}
if (inLobby(p)) {
if (ap.getArenaClass() != null) {
limitManager.playerLeftClass(ap.getArenaClass());
}
}
movePlayerToEntry(p);
discardPlayer(p);

6
src/com/garbagemule/MobArena/ArenaListener.java
View File

@ -794,11 +794,14 @@ public class ArenaListener
// If they already had a class, make sure to change the "in use" in the Class Limit Manager
if (oldAC != null) {
p.sendMessage("already had a class");
// If they picked the same sign, don't do anything
if (oldAC.equals(newAC)) {
p.sendMessage("picked the same class");
return;
}
classLimits.playerChangedClass(oldAC);
System.out.println("decrementing the classesInUse of " + oldAC.getName());
classLimits.playerLeftClass(oldAC);
}
// If they can not join the class, deny them
@ -808,6 +811,7 @@ public class ArenaListener
}
// Increment the "in use" in the Class Limit Manager
System.out.println("incrementing the classesInUse of " + newAC.getName());
classLimits.playerPickedClass(newAC);
// Delay the inventory stuff to ensure that right-clicking works.

23
src/com/garbagemule/MobArena/ClassLimitManager.java
View File

@ -5,6 +5,7 @@ import java.util.Map;
import com.garbagemule.MobArena.framework.Arena;
import com.garbagemule.MobArena.util.config.ConfigSection;
import com.garbagemule.MobArena.util.config.ConfigUtils;
public class ClassLimitManager
{
@ -15,7 +16,11 @@ public class ClassLimitManager
public ClassLimitManager(Arena arena, Map<String, ArenaClass> classes) {
this.plugin = arena.getPlugin();
ConfigUtils.addMissingNodes(plugin, plugin.getMAConfig(), "arenas." + arena.configName() + ".class-limits", "class-limits.yml");
this.limits = new ConfigSection(plugin.getMAConfig(), "arenas." + arena.configName() + ".class-limits");
//TODO figure out why limits is not loading the proper values from the config
//TODO perhaps send along the limits config section from the ArenaImpl class?
//TODO try to use ArenaRegion's config stuff to set up CLM properly
this.classes = classes;
this.classLimits = new HashMap<ArenaClass, Integer>();
@ -43,14 +48,16 @@ public class ClassLimitManager
*/
public void playerPickedClass(ArenaClass ac) {
classesInUse.put(ac, classesInUse.get(ac) + 1);
debug();
}
/**
* This is the class a player changed from
* This is the class a player left
* @param ac the current/old ArenaClass
*/
public void playerChangedClass(ArenaClass ac) {
public void playerLeftClass(ArenaClass ac) {
classesInUse.put(ac, classesInUse.get(ac) - 1);
debug();
}
/**
@ -59,6 +66,7 @@ public class ClassLimitManager
* @return true/false
*/
public boolean canPlayerJoinClass(ArenaClass ac) {
debug();
if (classLimits.get(ac) <= -1)
return true;
else if (classesInUse.get(ac) >= classLimits.get(ac))
@ -70,5 +78,16 @@ public class ClassLimitManager
public void clearClassesInUse() {
classesInUse.clear();
initInUseMap();
debug();
}
private void debug() {
System.out.println("classesInUse:");
for (ArenaClass ac : classesInUse.keySet())
System.out.println(ac.getName() + " has " + classesInUse.get(ac).intValue() + " players using it.");
System.out.println();
System.out.println("classLimits:");
for (ArenaClass ac : classLimits.keySet())
System.out.println(ac.getName() + " has a limit of " + classLimits.get(ac).intValue() + " players.");
}
}