Use 1.11 API, commented on code to possibly remove
This commit is contained in:
parent
554bb94832
commit
d6caffb2e2
2
pom.xml
2
pom.xml
|
|
@ -58,7 +58,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bukkit</groupId>
|
<groupId>org.bukkit</groupId>
|
||||||
<artifactId>bukkit</artifactId>
|
<artifactId>bukkit</artifactId>
|
||||||
<version>1.10.2-R0.1-SNAPSHOT</version>
|
<version>1.11-R0.1-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--Worldguard dependency-->
|
<!--Worldguard dependency-->
|
||||||
|
|
|
||||||
|
|
@ -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
|
//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.
|
//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)
|
if(attacker == null)
|
||||||
{
|
{
|
||||||
//exception case
|
//exception case
|
||||||
|
|
|
||||||
|
|
@ -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
|
//ensure this entity can be tamed by players
|
||||||
tameable.setOwner(null);
|
tameable.setOwner(null);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user