From d6caffb2e2fc714024c88e8671656aed8d3d25f1 Mon Sep 17 00:00:00 2001 From: RoboMWM Date: Thu, 17 Nov 2016 02:14:47 -0800 Subject: [PATCH] Use 1.11 API, commented on code to possibly remove --- pom.xml | 2 +- src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java | 1 + src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fe86d5f..a3dec25 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ org.bukkit bukkit - 1.10.2-R0.1-SNAPSHOT + 1.11-R0.1-SNAPSHOT provided diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index 9553d41..db6dd42 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -980,6 +980,7 @@ public class EntityEventHandler implements Listener { //if damaged by anything other than a player (exception villagers injured by zombies in admin claims), cancel the event //why exception? so admins can set up a village which can't be CHANGED by players, but must be "protected" by players. + //TODO: Discuss if this should only apply to admin claims...? if(attacker == null) { //exception case diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index f39cf47..9236f40 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -1150,7 +1150,7 @@ class PlayerEventHandler implements Listener } } } - else //world repair code for a now-fixed GP bug + else //world repair code for a now-fixed GP bug //TODO: necessary anymore? { //ensure this entity can be tamed by players tameable.setOwner(null);