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

Upstream Merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-04 08:51:09 +10:00
parent 4d8ae2cd25
commit eb9d70ade9
11 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From aed8f98426fff44dfbe86e4cf0b3aa106cabbd13 Mon Sep 17 00:00:00 2001
From 5007d731040f3c02b189a979c40c961f27e3e16b 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,10 +63,10 @@ index 108b375..4edd5e3 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 6db7b9b..8cea95c 100644
index cccfe75..d8f56e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -35,6 +35,7 @@ import org.bukkit.Material;
@@ -35,6 +35,7 @@ import org.bukkit.Server;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState;
@@ -74,7 +74,7 @@ index 6db7b9b..8cea95c 100644
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlock;
@@ -117,6 +118,22 @@ public class CraftEventFactory {
@@ -115,6 +116,22 @@ public class CraftEventFactory {
}
/**