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-26 01:46:43 -05:00
commit 6de7b8a73e
5 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
View File

@ -91,6 +91,15 @@ public class Gameplay extends MiniPlugin
Bukkit.getPluginManager().registerEvents(new CustomCreatures(), plugin);
}
@EventHandler(priority = EventPriority.LOWEST)
public void spawnDamage(CustomDamageEvent event)
{
if (_clansManager.getClanUtility().getClaim(event.GetDamageeEntity().getLocation()) != null && _clansManager.getClanUtility().getClaim(event.GetDamageeEntity().getLocation()).Safe)
{
event.SetCancelled("Safe Zone");
}
}
@EventHandler
public void onPlayerFishing(PlayerFishEvent event)
{

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/CombatLogNPC.java
View File

@ -63,7 +63,7 @@ public class CombatLogNPC
_userDataPath = userDataPath;
_disguiseManager = disguiseManager;
_hologram = new Hologram(hologramManager, player.getEyeLocation().add(0, 0.65, 0), C.cYellow + UtilTime.MakeStr(NPCManager.COMBAT_LOG_DURATION) + C.cWhite + " Seconds left before despawn");
_hologram = new Hologram(hologramManager, player.getEyeLocation().add(0, 1, 0), C.cYellow + UtilTime.MakeStr(NPCManager.COMBAT_LOG_DURATION) + C.cWhite + " Seconds left before despawn");
_spawnDate = 0;
_endingTime = System.currentTimeMillis() + NPCManager.COMBAT_LOG_DURATION;
_spawnHealth = player.getHealth();
@ -115,7 +115,7 @@ public class CombatLogNPC
public void update()
{
_hologram.setText(C.cYellow + UtilTime.MakeStr(UtilMath.clamp(_endingTime - System.currentTimeMillis(), 0, 100000000)) + C.cWhite + " left before despawn");
_hologram.setText(UtilTime.MakeStr(Math.min(_endingTime - System.currentTimeMillis(), 0)));
}
/**

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
View File

@ -61,13 +61,11 @@ public class WindBlade extends LegendaryItem
removePower(0.15);
_burnoutThreshold = 0;
UtilTextMiddle.display(C.cRed + "Flight power damaged!", "Repairing will be finished in " + F.time(UtilTime.MakeStr(burnoutRemaining)), wielder);
}
if (_messageTimer % 20 == 0)
{
UtilPlayer.message(wielder, F.main("WindBlade", "Flight power damaged whilst scraping the ground! Repairs will be finish in " + F.time(UtilTime.MakeStr(burnoutRemaining)) + "."));
UtilPlayer.message(wielder, F.main("Wind Blade", "Flight power damaged whilst scraping the ground! Repairs will be finish in " + F.time(UtilTime.MakeStr(burnoutRemaining)) + "."));
}
if (_messageTimer % 10 == 0)
{

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/types/ClanTips.java
View File

@ -202,7 +202,7 @@ public class ClanTips extends MiniPlugin
new String[] {
C.cDAquaB + "Energy",
C.cAqua + "To top up your energy, go to the Shop and buy some in the Energy Shop.",
C.cAqua + "To find the Shop, look at your map (use " + F.elem("/map") + " if you don't have one) and go to either the top-most highlighted area, or the bottom-most highlighted area.",
C.cAqua + "To find the Shop, look at your map (use " + C.cYellow + "/map" + C.cAqua + " if you don't have one) and go to either the top-most highlighted area, or the bottom-most highlighted area.",
}),
;

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

@ -1,24 +1,11 @@
package mineplex.game.clans.tutorials.types;
import java.util.HashMap;
import java.util.Map;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.inventory.ItemStack;
import com.google.common.base.Function;
import mineplex.core.common.util.Callback;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilItem;
import mineplex.core.common.util.UtilItem.ArmorMaterial;
import mineplex.core.common.util.UtilItem.ItemCategory;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.task.TaskManager;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
@ -26,8 +13,6 @@ import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.event.ClanCreatedEvent;
import mineplex.game.clans.clans.event.ClanDisbandedEvent;
import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
import mineplex.game.clans.clans.event.ClansPlayerBuyItemEvent;
import mineplex.game.clans.clans.event.ClansShopAddButtonEvent;
import mineplex.game.clans.clans.event.PlayerEnterTerritoryEvent;
import mineplex.game.clans.economy.GoldManager;
import mineplex.game.clans.spawn.Spawn;