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

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

Browse Source 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
This commit is contained in:
Shaun Bennett 2016-04-05 13:04:39 +10:00
parent cd5ad89f51
commit 23232efd63
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
View File

@ -56,12 +56,12 @@ public class MotdManager implements Listener, Runnable
//String motdLine = "§f§l◄ §c§lMaintenance§f§l ►"; //String motdLine = "§f§l◄ §c§lMaintenance§f§l ►";
//String motdLine = "§f§l◄ §a§lCarl the Creeper§f§l ►"; //String motdLine = "§f§l◄ §a§lCarl the Creeper§f§l ►";
// String motdLine = " §2§l§n M O N S T E R M A Z E B E T A §f"; // String motdLine = " §2§l§n M O N S T E R M A Z E B E T A §f";
String motdLine = " §f❄ §2§lMerry Christmas §f❄ §2§lElf Presents §f❄"; String motdLine = " §f> §4§lCLANS BETA §f- §c§lOpen to Everyone §f<";
// String motdLine = " §f❄ §2§lServer Maintenance §f❄ §2§lBe Back Soon §f❄"; // String motdLine = " §f❄ §2§lServer Maintenance §f❄ §2§lBe Back Soon §f❄";
//String motdLine = " §d§lRank Sale §a§l40% Off"); //String motdLine = " §d§lRank Sale §a§l40% Off");
//String motdLine = " §f§l◄§c§lMAINTENANCE§f§l►"); //String motdLine = " §f§l◄§c§lMAINTENANCE§f§l►");
updateMainMotd(" §c§m §f§m §c§m §f§m §2§l§m[ §r §c§lMineplex§r §f§lGames§r §2§l§m ]§f§m §c§m §f§m §c§m §r", motdLine); updateMainMotd(" §f§m §8§l§m[ §r §9§lMineplex§r §f§lGames§r §8§l§m ]§f§m §r", motdLine);
System.out.println("Updated Bungee MOTD"); System.out.println("Updated Bungee MOTD");
} }
} }

40
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java
View File

@ -77,11 +77,11 @@ public class Cannon extends SiegeWeapon
return false; return false;
} }
if (!_ownerClan.isMember(player)) // if (!_ownerClan.isMember(player))
{ // {
UtilPlayer.message(player, F.main("Clans", "This cannon is not owned by your Clan.")); // UtilPlayer.message(player, F.main("Clans", "This cannon is not owned by your Clan."));
return false; // return false;
} // }
if(_clans.hasTimer(player)) if(_clans.hasTimer(player))
{ {
@ -107,11 +107,11 @@ public class Cannon extends SiegeWeapon
enableInventory(UtilServer.getServer().createInventory(null, InventoryType.DISPENSER, C.cDAquaB + _name), new AccessRule(AccessType.RCLICK_BB, player -> player.equals(getRider()))); enableInventory(UtilServer.getServer().createInventory(null, InventoryType.DISPENSER, C.cDAquaB + _name), new AccessRule(AccessType.RCLICK_BB, player -> player.equals(getRider())));
setRideable(new AccessRule(AccessType.RCLICK_BB, player -> { setRideable(new AccessRule(AccessType.RCLICK_BB, player -> {
if (!_ownerClan.isMember(player)) // if (!_ownerClan.isMember(player))
{ // {
UtilPlayer.message(player, F.main("Clans", "This Cannon is not owned by your Clan.")); // UtilPlayer.message(player, F.main("Clans", "This Cannon is not owned by your Clan."));
return false; // return false;
} // }
if (getRider() != null && !getRider().equals(player)) if (getRider() != null && !getRider().equals(player))
{ {
@ -161,11 +161,11 @@ public class Cannon extends SiegeWeapon
return false; return false;
} }
if (!_ownerClan.isMember(player)) // if (!_ownerClan.isMember(player))
{ // {
UtilPlayer.message(player, F.main("Clans", "This Cannon is not owned by your Clan.")); // UtilPlayer.message(player, F.main("Clans", "This Cannon is not owned by your Clan."));
return false; // return false;
} // }
if (_clans.hasTimer(player)) if (_clans.hasTimer(player))
{ {
@ -191,11 +191,11 @@ public class Cannon extends SiegeWeapon
enableInventory(UtilServer.getServer().createInventory(null, InventoryType.DISPENSER, C.cDAquaB + _name), new AccessRule(AccessType.RCLICK_BB, player -> player.equals(getRider()))); enableInventory(UtilServer.getServer().createInventory(null, InventoryType.DISPENSER, C.cDAquaB + _name), new AccessRule(AccessType.RCLICK_BB, player -> player.equals(getRider())));
setRideable(new AccessRule(AccessType.RCLICK_BB, player -> { setRideable(new AccessRule(AccessType.RCLICK_BB, player -> {
if (!_ownerClan.isMember(player)) // if (!_ownerClan.isMember(player))
{ // {
UtilPlayer.message(player, F.main("Clans", "This Cannon is not owned by your Clan.")); // UtilPlayer.message(player, F.main("Clans", "This Cannon is not owned by your Clan."));
return false; // return false;
} // }
if (getRider() != null && !getRider().equals(player)) if (getRider() != null && !getRider().equals(player))
{ {

4
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
View File

@ -272,9 +272,9 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
C.Reset + "the games you want, when you want.", C.Reset + "the games you want, when you want.",
}).setHideInfo(true).build(), new SelectPLAYERButton(this)); }).setHideInfo(true).build(), new SelectPLAYERButton(this));
addButton(40, new ItemBuilder(Material.IRON_DOOR).setTitle(C.cYellowB + "Mineplex Clans " + C.cGray + "Champions Teams").addLore(new String[] addButton(40, new ItemBuilder(Material.IRON_DOOR).setTitle(C.cYellowB + "Mineplex Clans " + C.cGray + "Factions PvP").addLore(new String[]
{ {
(_extraValue ? C.cAquaB : C.cWhiteB) + "ALPHA RELEASE", (_extraValue ? C.cAquaB : C.cWhiteB) + "BETA RELEASE",
C.Reset + "", C.Reset + "",
C.Reset + "Equip custom skills and builds", C.Reset + "Equip custom skills and builds",
C.Reset + "and join your clan to destroy", C.Reset + "and join your clan to destroy",