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

Immolate fix hopefully

Browse Source
This commit is contained in:
NewGarbo 2015-11-27 06:05:22 +00:00
parent 9082ace3f3
commit a9669ade31
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -950,7 +950,7 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
public void onJoin(PlayerLoginEvent event) public void onJoin(PlayerLoginEvent event)
{ {
Rank rank = _clientManager.Get(event.getPlayer()).GetRank(); Rank rank = _clientManager.Get(event.getPlayer()).GetRank();
if (!event.getPlayer().isWhitelisted() || rank.has(Rank.EVENT)) if (!event.getPlayer().isWhitelisted() || !rank.has(Rank.EVENT))
{ {
event.setResult(PlayerLoginEvent.Result.KICK_OTHER); event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
// event.setKickMessage("This server is whitelisted!"); // event.setKickMessage("This server is whitelisted!");

8
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/potato/PotatoManager.java
View File

@ -29,7 +29,7 @@ import mineplex.game.clans.clans.ClansManager;
public class PotatoManager extends MiniPlugin implements IThrown public class PotatoManager extends MiniPlugin implements IThrown
{ {
private static final String POTATO_NAME = C.cGray + "POTATO"; private static final String POTATO_NAME = C.cGray + "Potato";
private ClansManager _clansManager; private ClansManager _clansManager;
@ -49,9 +49,9 @@ public class PotatoManager extends MiniPlugin implements IThrown
private void give(Player player, int count) private void give(Player player, int count)
{ {
ItemStack potato = new ItemStack(Material.BAKED_POTATO, count); ItemStack potato = new ItemStack(Material.BAKED_POTATO, count);
// ItemMeta meta = potato.getItemMeta(); ItemMeta meta = potato.getItemMeta();
// meta.setDisplayName(POTATO_NAME); meta.setDisplayName(POTATO_NAME);
// potato.setItemMeta(meta); potato.setItemMeta(meta);
player.getInventory().addItem(potato); player.getInventory().addItem(potato);
} }

3
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/Fire.java
View File

@ -111,10 +111,11 @@ public class Fire extends MiniPlugin
if (!_fire.containsKey(fire)) if (!_fire.containsKey(fire))
return; return;
event.setCancelled(true);
if (!_fire.get(fire).canHitOwner() && _fire.get(fire).GetOwner().equals(player)) if (!_fire.get(fire).canHitOwner() && _fire.get(fire).GetOwner().equals(player))
return; return;
event.setCancelled(true);
if (((CraftPlayer)player).getHandle().spectating) if (((CraftPlayer)player).getHandle().spectating)
return; return;