twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 20:23:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix patch conflicts

Browse Source
This commit is contained in:
md_5
2016-03-12 20:59:15 +11:00
parent b7d6f29245
commit bd4ee28e5c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,10 +23,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ public class CraftEventFactory {
event.getInventory().setItem(2, event.getResult());
return event;
}
+
+ /**
+ * Mob spawner event.
+ */
@@ -41,5 +40,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ 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);
--