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

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
paper-server/nms-patches/PathfinderGoalTame.patch
View File

@@ -1,12 +1,12 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/PathfinderGoalTame.java 2014-11-28 17:43:43.313707430 +0000
+++ src/main/java/net/minecraft/server/PathfinderGoalTame.java 2014-11-28 17:38:21.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/PathfinderGoalTame.java 2015-02-26 22:40:22.975608135 +0000
+++ src/main/java/net/minecraft/server/PathfinderGoalTame.java 2015-02-26 22:40:22.975608135 +0000
@@ -45,7 +45,8 @@
int i = this.entity.getTemper();
int j = this.entity.getMaxDomestication();
- if (j > 0 && this.entity.bb().nextInt(j) < i) {
- if (j > 0 && this.entity.bc().nextInt(j) < i) {
+ // CraftBukkit - fire EntityTameEvent
+ if (j > 0 && this.entity.bb().nextInt(j) < i && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.entity, (EntityHuman) this.entity.passenger).isCancelled() && this.entity.passenger instanceof EntityHuman) {
+ if (j > 0 && this.entity.bc().nextInt(j) < i && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.entity, (EntityHuman) this.entity.passenger).isCancelled() && this.entity.passenger instanceof EntityHuman) {
this.entity.h((EntityHuman) this.entity.passenger);
this.entity.world.broadcastEntityEffect(this.entity, (byte) 7);
return;
@@ -26,6 +26,6 @@
+ }
+ // this.entity.passenger = null;
+ // CraftBukkit end
this.entity.cU();
this.entity.cW();
this.entity.world.broadcastEntityEffect(this.entity, (byte) 6);
}