Attempting to fix issues #272 , #266 , #261 , and #255 .

This commit is contained in:
U-YUE\Sean
2012-10-30 11:46:52 -07:00
parent 8dfa8c20f3
commit ab7a83b37e
18 changed files with 161 additions and 0 deletions

View File

@ -27,6 +27,9 @@ public class UnarmedManager {
* @param defender The defending player
*/
public void disarmCheck(Player defender) {
if(player == null)
return;
if (!permissionsInstance.disarm(player)) {
return;
}
@ -58,6 +61,9 @@ public class UnarmedManager {
* @param event The event to modify
*/
public void deflectCheck(EntityDamageEvent event) {
if(player == null)
return;
if (!permissionsInstance.deflect(player)) {
return;
}
@ -82,6 +88,9 @@ public class UnarmedManager {
* @param event The event to modify.
*/
public void bonusDamage(EntityDamageEvent event) {
if(player == null)
return;
if (!permissionsInstance.unarmedBonus(player)) {
return;
}
@ -99,6 +108,9 @@ public class UnarmedManager {
* @return true if the defender was not disarmed, false otherwise
*/
private boolean hasIronGrip(Player defender) {
if(defender == null)
return false;
if (!permissionsInstance.ironGrip(defender)) {
return false;
}