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

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

Browse Source
This commit is contained in:
Shaun Bennett 2015-11-24 17:27:46 -05:00
commit 57302221df
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansBlacklist.java
View File

@ -15,7 +15,8 @@ public class ClansBlacklist
"Wilderness", "Shops", "Builder", "Spawn", "Clan", "Clans",
"Fields", "Sr.Mod", "Sr. Mod", "Dev", "Jr.Dev", "Jr. Dev", "create",
"join", "leave", "map", "cc", "ac", "invite", "kick", "neutral",
"enemy", "trust", "unclaim", "claim", "delete", "SrMod"
"enemy", "trust", "unclaim", "claim", "delete", "SrMod", "Twitch", "YouTube", "Event",
"Media", "MapLead", "JrDev", "Developer", "Leader", "LT", "Support"
};
/**

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
View File

@ -383,7 +383,7 @@ public class ClansGame extends MiniPlugin
}
// Allow Clan's Home
if (event.getClickedBlock().getLocation().distance(home) <= 2 && event.getClickedBlock().getType().equals(Material.BED_BLOCK))
if (home != null && event.getClickedBlock().getLocation().distance(home) <= 2 && event.getClickedBlock().getType().equals(Material.BED_BLOCK))
{
return;
}
@ -402,7 +402,7 @@ public class ClansGame extends MiniPlugin
Location home = event.getClickedBlock() == null ? null : _clans.getClanUtility().getClanByClanName(_clans.getClanUtility().getClaim(event.getClickedBlock().getLocation()).Owner).getHome();
// Allow Clan's Home
if (event.getClickedBlock().getLocation().distance(home) <= 2 && event.getClickedBlock().getType().equals(Material.BED_BLOCK))
if (home != null && event.getClickedBlock().getLocation().distance(home) <= 2 && event.getClickedBlock().getType().equals(Material.BED_BLOCK))
{
return;
}

6
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/WorldEventManager.java
View File

@ -78,7 +78,7 @@ public class WorldEventManager extends MiniPlugin implements ScoreboardElement
}
@EventHandler
public void cleanupEvent(UpdateEvent event)
public void update(UpdateEvent event)
{
if (event.getType() != UpdateType.SEC)
{
@ -136,7 +136,7 @@ public class WorldEventManager extends MiniPlugin implements ScoreboardElement
else
{
// Try again in 5 minutes
_nextEventStart = System.currentTimeMillis() + 300000;
_nextEventStart = System.currentTimeMillis() + (5 * 60 * 1000);
}
}
@ -214,7 +214,7 @@ public class WorldEventManager extends MiniPlugin implements ScoreboardElement
private void updateNextEventTime()
{
// 45 Minutes + (0 - 15 Minutes)
long waitTime = 2700000L + _random.nextInt(900000);
long waitTime = (45 * 60 * 1000) + _random.nextInt(15 * 60 * 1000);
_nextEventStart = System.currentTimeMillis() + waitTime;
}

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/types/TutorialGettingStarted.java
View File

@ -41,7 +41,7 @@ public class TutorialGettingStarted extends Tutorial
{
public TutorialGettingStarted(final TutorialManager manager, final ClansManager clansManager, final GoldManager goldManager, final TaskManager taskManager)
{
super(50, goldManager, taskManager, clansManager, manager);
super(5000, goldManager, taskManager, clansManager, manager);
addTask(1, "Welcome", "Welcome to Clans! Before you start playing Clans, you need to create a Clan by typing {/c create [name]}! Don't worry though, at the end of this tutorial, you will be disbanding this clan. You will then be able to make a new clan, or join a friend's clan!");
addTask(2, "Viewing Clan Info", "Now you can view information about your clan. To do this type {/c [name]}! You can also use any clan's name to get some information about them as well.");
@ -49,8 +49,6 @@ public class TutorialGettingStarted extends Tutorial
addTask(4, "Go To The Wilderness", "Access your map with {/map} and head out into the wilderness! You’ll see various other locations marked on your map later.");
addTask(5, "Claiming Territory", "In order to claim a chunk of land for your clan you type {/c claim}! Keep in mind that you can only claim in the Wilderness, and not too close to other clan's claims and safe areas. Notice though, your clan runs on energy! You can buy energy from the shops!", "Good job! We won't claim this area just yet, you can do it again later when you find a nice location after the tutorial.");
addTask(6, "Visit The Shops", "At the shops you can buy most things you need! Once a day you can transfer 1000 gems to 5000 clans gold here as well!");
// addTask(7, "Buy Armor", "Head to the PvP Gear villager and purchase a set of armor! Make sure to buy a matching set to access your class skills!");
// addTask(8, "Equip Armor", "In order to equip a kit, you must put on the full armor set of that kit! Put on the armor set you just bought and you will have selected your kit!");
addTask(7, "Use An Ability", "In order to use abilities you need a sword or axe. To use your sword ability, right click with your sword! To use your axe ability, right click with your axe!");
addTask(8, "Class Customization", "To customize your class, right click an enchantment table! There you will find the GUI for all the skills in that class! Customize it to your liking!");
addTask(9, "Disband Clan", "To disband your own clan, you can do {/c disband}, this will delete your clan, and you will be able to start a new one!");