AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #236 from speedxx/development

Browse Source 
fix cage & uncage
This commit is contained in:
Telesphoreo 2020-07-21 23:20:23 -05:00 committed by GitHub
commit fc05003354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
View File

@ -47,6 +47,11 @@ public class Command_cage extends FreedomCommand
} }
final FPlayer fPlayer = plugin.pl.getPlayer(player); final FPlayer fPlayer = plugin.pl.getPlayer(player);
if (fPlayer.getCageData().isCaged())
{
sender.sendMessage(ChatColor.RED + "That player is already caged.");
return true;
}
Material outerMaterial = Material.GLASS; Material outerMaterial = Material.GLASS;
Material innerMaterial = Material.AIR; Material innerMaterial = Material.AIR;

7
src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java
View File

@ -30,18 +30,15 @@ public class Command_uncage extends FreedomCommand
} }
final FPlayer fPlayer = plugin.pl.getPlayer(player); final FPlayer fPlayer = plugin.pl.getPlayer(player);
if (fPlayer.getCageData().isCaged()) if (fPlayer.getCageData().isCaged())
{ {
FUtil.adminAction(sender.getName(), "Uncaging " + sender.getName(), true); FUtil.adminAction(sender.getName(), "Uncaging " + player.getName(), true);
final FPlayer playerdata = plugin.pl.getPlayer(playerSender); fPlayer.getCageData().setCaged(false);
playerdata.getCageData().setCaged(false);
} }
else else
{ {
msg("That player is not caged!", ChatColor.RED); msg("That player is not caged!", ChatColor.RED);
} }
return true; return true;
} }
} }