JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta

Browse Source 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
This commit is contained in:
Shaun Bennett 2016-03-08 12:27:45 -06:00
parent 3283b873e7
commit 99c2fefed2
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java
View File

@ -19,8 +19,6 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import mineplex.core.vanish.events.PreVanishEvent;
public class UtilServer public class UtilServer
{ {
public static Player[] getPlayers() public static Player[] getPlayers()
@ -115,7 +113,7 @@ public class UtilServer
return getServer().getPluginManager(); return getServer().getPluginManager();
} }
public static <T extends Event> T callEvent(T event) public static <T extends Event> void callEvent(T event)
{ {
getPluginManager().callEvent(event); getPluginManager().callEvent(event);
} }

3
Plugins/Mineplex.Core/src/mineplex/core/vanish/Vanish.java
View File

@ -59,9 +59,6 @@ public class Vanish extends MiniClientPlugin<VanishClient>
return enabled; return enabled;
} }
@EventHandler
public void join
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void ClientLoad(AsyncPlayerPreLoginEvent event) public void ClientLoad(AsyncPlayerPreLoginEvent event)
{ {

2
Plugins/Mineplex.Core/src/mineplex/core/vanish/repository/VanishRepository.java
View File

@ -38,7 +38,7 @@ public class VanishRepository extends MinecraftRepository
status.Set(Boolean.FALSE); status.Set(Boolean.FALSE);
}, new ColumnInt("accountId", accountId)); }, new ColumnInt("accountId", accountId));
return status.GetDispose().booleanValue(); return status.Get().booleanValue();
} }
protected void initialize() protected void initialize()

23
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
View File

@ -94,7 +94,6 @@ import mineplex.game.clans.clans.redis.ClanLoadCommandHandler;
import mineplex.game.clans.clans.regions.ClansRegions; import mineplex.game.clans.clans.regions.ClansRegions;
import mineplex.game.clans.clans.scoreboard.ClansScoreboardManager; import mineplex.game.clans.clans.scoreboard.ClansScoreboardManager;
import mineplex.game.clans.clans.siege.SiegeManager; import mineplex.game.clans.clans.siege.SiegeManager;
import mineplex.game.clans.clans.stuck.StuckManager;
import mineplex.game.clans.clans.supplyDrop.SupplyDropManager; import mineplex.game.clans.clans.supplyDrop.SupplyDropManager;
import mineplex.game.clans.clans.tntGenerator.TntGeneratorManager; import mineplex.game.clans.clans.tntGenerator.TntGeneratorManager;
import mineplex.game.clans.clans.war.WarManager; import mineplex.game.clans.clans.war.WarManager;
@ -165,6 +164,7 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
private LootManager _lootManager; private LootManager _lootManager;
private DonationManager _donationManager; private DonationManager _donationManager;
private NetherManager _netherManager; private NetherManager _netherManager;
private DamageManager _damageManager;
private Playtime _playTracker; private Playtime _playTracker;
@ -241,9 +241,9 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
Creature creature = new Creature(plugin); Creature creature = new Creature(plugin);
_npcManager = new NpcManager(plugin, creature); _npcManager = new NpcManager(plugin, creature);
_condition = new SkillConditionManager(plugin); _condition = new SkillConditionManager(plugin);
DamageManager damageManager = new DamageManager(plugin, _combatManager, _npcManager, _disguiseManager, _condition); _damageManager = new DamageManager(plugin, _combatManager, _npcManager, _disguiseManager, _condition);
damageManager.addCommand(new KillCommand(damageManager)); _damageManager.addCommand(new KillCommand(_damageManager));
_worldEvent = new WorldEventManager(plugin, this, damageManager, _lootManager, blockRestore, _clanRegions, null); _worldEvent = new WorldEventManager(plugin, this, _damageManager, _lootManager, blockRestore, _clanRegions, null);
TaskManager taskManager = new TaskManager(plugin, _clientManager, webServerAddress); TaskManager taskManager = new TaskManager(plugin, _clientManager, webServerAddress);
@ -280,23 +280,23 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
_observerManager = new ObserverManager(plugin, _condition, this); _observerManager = new ObserverManager(plugin, _condition, this);
new ClanEnergyTracker(plugin, this); new ClanEnergyTracker(plugin, this);
new StuckManager(this); // new StuckManager(this);
// new ClansAlphaManager(this, taskManager); // new ClansAlphaManager(this, taskManager);
new PotatoManager(plugin, this); new PotatoManager(plugin, this);
new Weapon(plugin, energy); new Weapon(plugin, energy);
new Gameplay(plugin, this, blockRestore, damageManager); new Gameplay(plugin, this, blockRestore, _damageManager);
_projectileManager = new ProjectileManager(plugin); _projectileManager = new ProjectileManager(plugin);
Fire fire = new Fire(plugin, _condition, damageManager); Fire fire = new Fire(plugin, _condition, _damageManager);
HashSet<String> itemIgnore = new HashSet<String>(); HashSet<String> itemIgnore = new HashSet<String>();
itemIgnore.add("Proximity Explosive"); itemIgnore.add("Proximity Explosive");
itemIgnore.add("Proximity Zapper"); itemIgnore.add("Proximity Zapper");
ItemFactory itemFactory = new ItemFactory(plugin, blockRestore, _condition, damageManager, energy, fire, _projectileManager, webServerAddress, itemIgnore); ItemFactory itemFactory = new ItemFactory(plugin, blockRestore, _condition, _damageManager, energy, fire, _projectileManager, webServerAddress, itemIgnore);
SkillFactory skillManager = new SkillFactory(plugin, damageManager, this, _combatManager, _condition, _projectileManager, _disguiseManager, blockRestore, fire, new Movement(plugin), teleport, energy, webServerAddress); SkillFactory skillManager = new SkillFactory(plugin, _damageManager, this, _combatManager, _condition, _projectileManager, _disguiseManager, blockRestore, fire, new Movement(plugin), teleport, energy, webServerAddress);
skillManager.RemoveSkill("Dwarf Toss", "Block Toss"); skillManager.RemoveSkill("Dwarf Toss", "Block Toss");
skillManager.removeSkill("Whirlwind Axe"); skillManager.removeSkill("Whirlwind Axe");
skillManager.removeSkill("Shield Smash"); skillManager.removeSkill("Shield Smash");
@ -1206,4 +1206,9 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
{ {
return player.getName().equals("NewGarbo"); return player.getName().equals("NewGarbo");
} }
public DamageManager getDamageManager()
{
return _damageManager;
}
} }