Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update from upstream SpigotMC

Browse Source 
66af3b310e0
a969bf6c85d
95d56229d8f
87c1d0c8b7c
baf01cc7f84
38b8866783d [M]
This commit is contained in:
Zach Brown
2014-12-02 00:02:15 -06:00
parent 2a326d9446
commit c55b9c30d7
17 changed files with 95 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch
View File

@@ -1,4 +1,4 @@
From d6637fb358b0354ead60a507e50010e09cfcb348 Mon Sep 17 00:00:00 2001
From fd45629acbd8663564bea3f190939d9e7754f033 Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:37 -0500
Subject: [PATCH] Implement SpawnerSpawnEvent.
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement SpawnerSpawnEvent.
Adds BUKKIT-267
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index 0b177f0..13c7d58 100644
index fe24b1f..ebcba7b 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -4,7 +4,11 @@ import com.google.common.collect.Lists;
@@ -22,7 +22,7 @@ index 0b177f0..13c7d58 100644
public abstract class MobSpawnerAbstract {
@@ -131,7 +135,12 @@ public abstract class MobSpawnerAbstract {
@@ -136,7 +140,12 @@ public abstract class MobSpawnerAbstract {
entity.f(nbttagcompound);
if (entity.world != null && flag) {
@@ -36,7 +36,7 @@ index 0b177f0..13c7d58 100644
}
NBTTagCompound nbttagcompound1;
@@ -155,6 +164,11 @@ public abstract class MobSpawnerAbstract {
@@ -160,6 +169,11 @@ public abstract class MobSpawnerAbstract {
entity2.f(nbttagcompound2);
entity2.setPositionRotation(entity1.locX, entity1.locY, entity1.locZ, entity1.yaw, entity1.pitch);
@@ -48,7 +48,7 @@ index 0b177f0..13c7d58 100644
if (entity.world != null && flag) {
entity.world.addEntity(entity2, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
}
@@ -166,7 +180,12 @@ public abstract class MobSpawnerAbstract {
@@ -171,7 +185,12 @@ public abstract class MobSpawnerAbstract {
}
} else if (entity instanceof EntityLiving && entity.world != null && flag) {
((EntityInsentient) entity).prepare(entity.world.E(new BlockPosition(entity)), (GroupDataEntity) null);