Update to Minecraft 1.8.3

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

View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityPig.java 2014-11-28 17:43:43.145707434 +0000
+++ src/main/java/net/minecraft/server/EntityPig.java 2014-11-28 17:38:23.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/EntityPig.java 2015-02-26 22:40:22.647608139 +0000
+++ src/main/java/net/minecraft/server/EntityPig.java 2015-02-26 22:40:22.647608139 +0000
@@ -1,5 +1,7 @@
package net.minecraft.server;
@@ -7,20 +7,24 @@
+
public class EntityPig extends EntityAnimal {
private final PathfinderGoalPassengerCarrotStick bk;
@@ -111,10 +113,17 @@
public void onLightningStrike(EntityLightning entitylightning) {
if (!this.world.isStatic) {
private final PathfinderGoalPassengerCarrotStick bm;
@@ -112,6 +114,12 @@
if (!this.world.isClientSide && !this.dead) {
EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
+
+ // CraftBukkit start
+ if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
+
entitypigzombie.setEquipment(0, new ItemStack(Items.GOLDEN_SWORD));
entitypigzombie.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
entitypigzombie.k(this.ce());
@@ -120,7 +128,8 @@
entitypigzombie.setCustomNameVisible(this.getCustomNameVisible());
}
- this.world.addEntity(entitypigzombie);
+ // CraftBukkit - added a reason for spawning this creature
+ this.world.addEntity(entitypigzombie, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING);