spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2019-04-02 21:23:20 +11:00
parent 5629554b03
commit f09662d0ea
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 5d61b55c91031229492a14e13431f5a526891347 Mon Sep 17 00:00:00 2001
From c518d69a6bd4ea3c61a1617aaab9530367775fde Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -25,7 +25,7 @@ index c89b5f26e..704e633c5 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 200b5c17c..f5fce00ca 100644
index 4d20ce992..334dd972d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1769,4 +1769,14 @@ public class CraftWorld implements World {
@ -180,10 +180,10 @@ index 0831e13e5..adb21dd24 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 32942ff24..99a5e4251 100644
index df1eb143e..a463c88ac 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -1282,4 +1282,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -1283,4 +1283,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
return HANDLED_TAGS;
}
}

12
CraftBukkit-Patches/0082-Better-item-validation.patch
View file

@ -1,4 +1,4 @@
From f260c9d4cc57d20835e7b2fcbfa9ee0204423e5a Mon Sep 17 00:00:00 2001
From 78fde11b28b85be9732afb731d3cc030b4f551cd Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Wed, 2 Jul 2014 23:35:51 +0100
Subject: [PATCH] Better item validation
@ -58,10 +58,10 @@ index adb21dd24..a0dc5524f 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 99a5e4251..c47697d6e 100644
index a463c88ac..55d63c045 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -74,6 +74,10 @@ import org.apache.commons.codec.binary.Base64;
@@ -75,6 +75,10 @@ import org.apache.commons.codec.binary.Base64;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@ -72,7 +72,7 @@ index 99a5e4251..c47697d6e 100644
/**
* Children must include the following:
*
@@ -305,7 +309,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -306,7 +310,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
if (display.hasKey(NAME.NBT)) {
try {
@ -81,7 +81,7 @@ index 99a5e4251..c47697d6e 100644
} catch (JsonParseException ex) {
// Ignore (stripped like Vanilla)
}
@@ -313,7 +317,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -314,7 +318,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
if (display.hasKey(LOCNAME.NBT)) {
try {
@ -90,7 +90,7 @@ index 99a5e4251..c47697d6e 100644
} catch (JsonParseException ex) {
// Ignore (stripped like Vanilla)
}
@@ -324,7 +328,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -325,7 +329,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
lore = new ArrayList<String>(list.size());
for (int index = 0; index < list.size(); index++) {

12
CraftBukkit-Patches/0098-Remove-uneeded-validation.patch
View file

@ -1,23 +1,23 @@
From 4564686fd664565d00bda7bb2b942d73253692b6 Mon Sep 17 00:00:00 2001
From d042080d150cffc520acd4fbdde0e030dc105734 Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Fri, 15 Aug 2014 18:11:09 -0400
Subject: [PATCH] Remove uneeded validation
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index c47697d6e..243d4354f 100644
index 55d63c045..222ba3c74 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -282,7 +282,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -283,7 +283,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
this.lore = new ArrayList<String>(meta.lore);
}
- if (meta.hasEnchants()) {
+ if (meta.enchantments != null) { // Spigot
this.enchantments = new HashMap<Enchantment, Integer>(meta.enchantments);
this.enchantments = new LinkedHashMap<Enchantment, Integer>(meta.enchantments);
}
@@ -634,7 +634,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -635,7 +635,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
}
static void applyEnchantments(Map<Enchantment, Integer> enchantments, NBTTagCompound tag, ItemMetaKey key) {
@ -26,7 +26,7 @@ index c47697d6e..243d4354f 100644
return;
}
@@ -773,7 +773,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -774,7 +774,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
public boolean removeEnchant(Enchantment ench) {
Validate.notNull(ench, "Enchantment cannot be null");

6
CraftBukkit-Patches/0102-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
View file

@ -1,14 +1,14 @@
From 2d4ce120c8b1a7fb3c504d235d31bcf59b7ca616 Mon Sep 17 00:00:00 2001
From 806a197d72dca51184c1cdc21325ae6e7a5035dc Mon Sep 17 00:00:00 2001
From: libraryaddict <redwarfare@live.com>
Date: Fri, 22 Aug 2014 05:35:16 -0400
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 243d4354f..99a2c8c8b 100644
index 222ba3c74..ef6437f38 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -1297,6 +1297,17 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -1298,6 +1298,17 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
// Spigot start
private final Spigot spigot = new Spigot()
{