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

Upstream merge

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-24 16:27:12 +10:00
parent a8030addd9
commit b56d35552d
78 changed files with 483 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch
View File

@@ -1,4 +1,4 @@
From 6283d084b9bd9e85048c6c422bff8533cdc6c44f Mon Sep 17 00:00:00 2001
From 722ea3f2c86af3f7e5819e4766f6211b3898cd17 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.
@@ -63,7 +63,7 @@ index 06f9b1f..b97ac4b 100644
return entity;
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 30f31d1..22e2879 100644
index 522d6b0..9a3c728 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -36,6 +36,7 @@ import org.bukkit.Statistic.Type;
@@ -74,7 +74,7 @@ index 30f31d1..22e2879 100644
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftStatistic;
import org.bukkit.craftbukkit.CraftWorld;
@@ -120,6 +121,22 @@ public class CraftEventFactory {
@@ -141,6 +142,22 @@ public class CraftEventFactory {
}
/**