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

Upstream merge

Browse Source
This commit is contained in:
Thinkofdeath
2015-03-24 20:45:15 +00:00
parent 67d1ba7c1a
commit 3e84fd4c31
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CraftBukkit-Patches/0126-Better-item-validation.patch
View File

@@ -105,9 +105,9 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -0,0 +0,0 @@ import java.util.EnumSet; @@ -0,0 +0,0 @@ import java.util.HashSet;
import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.bukkit.block.BlockState;
+// Spigot start +// Spigot start
+import static org.spigotmc.ValidateUtils.*; +import static org.spigotmc.ValidateUtils.*;

2
CraftBukkit-Patches/0142-Filter-attribute-modifiers-which-cause-the-attribute.patch
View File

@@ -9,7 +9,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -0,0 +0,0 @@ import java.util.Set; @@ -0,0 +0,0 @@ import org.bukkit.block.BlockState;
// Spigot start // Spigot start
import static org.spigotmc.ValidateUtils.*; import static org.spigotmc.ValidateUtils.*;