SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.12-pre2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-05-14 12:00:00 +10:00
parent b8446f770b
commit 40c8954e17
210 changed files with 2280 additions and 1974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
paper-server/nms-patches/PathfinderGoalTempt.patch
View File

@@ -17,25 +17,24 @@
private double e;
private double f;
private double g;
- private EntityHuman h;
+ private EntityLiving h; // CraftBukkit
- private EntityHuman target;
+ private EntityLiving target; // CraftBukkit
private int i;
private boolean j;
private final Set<Item> k;
@@ -39,7 +45,18 @@
@@ -39,7 +45,17 @@
return false;
} else {
this.h = this.a.world.findNearbyPlayer(this.a, 10.0D);
- return this.h == null ? false : this.a(this.h.getItemInMainHand()) || this.a(this.h.getItemInOffHand());
this.target = this.a.world.findNearbyPlayer(this.a, 10.0D);
- return this.target == null ? false : this.a(this.target.getItemInMainHand()) || this.a(this.target.getItemInOffHand());
+ // CraftBukkit start
+ // PAIL: rename
+ boolean tempt = this.h == null ? false : this.a(this.h.getItemInMainHand()) || this.a(this.h.getItemInOffHand());
+ boolean tempt = this.target == null ? false : this.a(this.target.getItemInMainHand()) || this.a(this.target.getItemInOffHand());
+ if (tempt) {
+ EntityTargetLivingEntityEvent event = CraftEventFactory.callEntityTargetLivingEvent(this.a, this.h, EntityTargetEvent.TargetReason.TEMPT);
+ EntityTargetLivingEntityEvent event = CraftEventFactory.callEntityTargetLivingEvent(this.a, this.target, EntityTargetEvent.TargetReason.TEMPT);
+ if (event.isCancelled()) {
+ return false;
+ }
+ this.h = ((CraftLivingEntity) event.getTarget()).getHandle();
+ this.target = ((CraftLivingEntity) event.getTarget()).getHandle();
+ }
+ return tempt;
+ // CraftBukkit end