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

Fix patch conflicts

Browse Source
This commit is contained in:
md_5
2016-03-12 20:59:15 +11:00
committed by Zach Brown
parent 80b1308735
commit bbac895bc9
7 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch
View File

@@ -1,4 +1,4 @@
From 071fbaa33adc4fca64ef162952ad4f5eccfb1a10 Mon Sep 17 00:00:00 2001
From 3915e4f8fec3e645a5a878c319dd15ff836a3528 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 3 Mar 2016 19:45:46 +1100
Subject: [PATCH] Implement SpawnerSpawnEvent.
@@ -19,14 +19,13 @@ index efe792b..a7903a2 100644
ChunkRegionLoader.a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
world.triggerEffect(2004, blockposition, 0);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 5083875..c9ff812 100644
index 3b7243b..f99b01f 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -984,4 +984,19 @@ public class CraftEventFactory {
event.getInventory().setItem(2, event.getResult());
@@ -985,6 +985,21 @@ public class CraftEventFactory {
return event;
}
+
+ /**
+ * Mob spawner event.
+ */
@@ -41,7 +40,10 @@ index 5083875..c9ff812 100644
+ entity.getServer().getPluginManager().callEvent(event);
+ return event;
+ }
}
+
public static EntityToggleGlideEvent callToggleGlideEvent(EntityLiving entity, boolean gliding) {
EntityToggleGlideEvent event = new EntityToggleGlideEvent((LivingEntity) entity.getBukkitEntity(), gliding);
entity.world.getServer().getPluginManager().callEvent(event);
--
2.5.0