core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (CraftBukkit) 

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
94b8708a SPIGOT-4373: Item display colours are white by default
61668436 SPIGOT-4378: Fix mistakenly included code
This commit is contained in:
Aikar 2018-09-15 19:13:40 -04:00
parent 90fd694c4c
commit 30785b9132
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
10 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
View File

@ -1,4 +1,4 @@
From ae8ffe9d11d117ef18da2199da5cdf644bf1a28d Mon Sep 17 00:00:00 2001
From 4e28941b1ac27f9fd6a7f6ad68d93e60fa976fd9 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API
@ -58,7 +58,7 @@ index cbdd2431fd..9e24b77ad1 100644
j = MathHelper.floor(entityhuman.locZ / 16.0D);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 957868d642..29d98ae30b 100644
index 6a72cfe14e..5dfa0fdec3 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -34,6 +34,7 @@ import org.bukkit.craftbukkit.block.data.CraftBlockData;
@ -69,7 +69,7 @@ index 957868d642..29d98ae30b 100644
import org.bukkit.event.block.BlockCanBuildEvent;
import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -2431,7 +2432,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -2439,7 +2440,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);

24
Spigot-Server-Patches/0068-Handle-Item-Meta-Inconsistencies.patch
View File

@ -1,4 +1,4 @@
From 651f454a03f6caa23e015e054b66bcb7b57d087c Mon Sep 17 00:00:00 2001
From b7a1a8d488e8abec9994bd7ed43d1c0f7bfd664d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 28 May 2015 23:00:19 -0400
Subject: [PATCH] Handle Item Meta Inconsistencies
@ -78,7 +78,7 @@ index 318c4204df..56787ed25c 100644
public boolean hasEnchantments() {
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index ef4c49f1ff..69425e838f 100644
index 1d0580ff7f..2733cda407 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@ -201,7 +201,7 @@ index ef4c49f1ff..69425e838f 100644
static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 3db06bed2c..3fd2088039 100644
index ef3e27b982..75669bd6ac 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -8,12 +8,14 @@ import java.lang.reflect.Constructor;
@ -227,7 +227,7 @@ index 3db06bed2c..3fd2088039 100644
import java.util.logging.Level;
import java.util.logging.Logger;
import net.minecraft.server.ChatComponentText;
@@ -235,7 +238,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -236,7 +239,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
private IChatBaseComponent displayName;
private IChatBaseComponent locName;
private List<String> lore;
@ -236,7 +236,7 @@ index 3db06bed2c..3fd2088039 100644
private int repairCost;
private int hideFlag;
private boolean unbreakable;
@@ -244,7 +247,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -245,7 +248,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
private static final Set<String> HANDLED_TAGS = Sets.newHashSet();
private NBTTagCompound internalTag;
@ -245,7 +245,7 @@ index 3db06bed2c..3fd2088039 100644
CraftMetaItem(CraftMetaItem meta) {
if (meta == null) {
@@ -259,7 +262,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -260,7 +263,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
}
if (meta.enchantments != null) { // Spigot
@ -254,7 +254,7 @@ index 3db06bed2c..3fd2088039 100644
}
this.repairCost = meta.repairCost;
@@ -492,13 +495,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -493,13 +496,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
}
}
@ -270,7 +270,7 @@ index 3db06bed2c..3fd2088039 100644
for (int i = 0; i < ench.size(); i++) {
String id = ((NBTTagCompound) ench.get(i)).getString(ENCHANTMENTS_ID.NBT);
@@ -573,13 +576,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -574,13 +577,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
void deserializeInternal(NBTTagCompound tag, Object context) {
}
@ -286,7 +286,7 @@ index 3db06bed2c..3fd2088039 100644
for (Map.Entry<?, ?> entry : ench.entrySet()) {
// Doctor older enchants
String enchantKey = entry.getKey().toString();
@@ -734,13 +737,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -735,13 +738,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
}
public Map<Enchantment, Integer> getEnchants() {
@ -302,7 +302,7 @@ index 3db06bed2c..3fd2088039 100644
}
if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) {
@@ -928,7 +931,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -929,7 +932,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
clone.lore = new ArrayList<String>(this.lore);
}
if (this.enchantments != null) {
@ -311,7 +311,7 @@ index 3db06bed2c..3fd2088039 100644
}
clone.hideFlag = this.hideFlag;
clone.unbreakable = this.unbreakable;
@@ -1099,6 +1102,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -1100,6 +1103,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
}
}
@ -336,5 +336,5 @@ index 3db06bed2c..3fd2088039 100644
private final Spigot spigot = new Spigot()
{
--
2.18.0
2.19.0

6
Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
View File

@ -1,4 +1,4 @@
From c9b30a74f54c83da7c319cb1b4b484cff5e8b5c8 Mon Sep 17 00:00:00 2001
From b1a77b3b388cf9701837f28106674433f30321f9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 13 Sep 2014 23:14:43 -0400
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -63,10 +63,10 @@ index bbd476bb0e..280e684db4 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index cc3ce8d83d..f815c8477c 100644
index 15c44293c7..48772f2163 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2867,8 +2867,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -2875,8 +2875,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
int k = i * 16 + 8 - blockposition.getX();
int l = j * 16 + 8 - blockposition.getZ();
boolean flag = true;

8
Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
View File

@ -1,14 +1,14 @@
From 34f5225d34a59ceeef04a55bf248cb688351094c Mon Sep 17 00:00:00 2001
From 84cabace57b32008571dee8b4b884825b446f045 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Apr 2016 19:42:22 -0400
Subject: [PATCH] Don't spam reload spawn chunks in nether/end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 75e2de1a22..4bed101c08 100644
index 389ef2aa9d..bace4bff75 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2863,6 +2863,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -2871,6 +2871,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
return this.K;
}
@ -16,7 +16,7 @@ index 75e2de1a22..4bed101c08 100644
public boolean e(int i, int j) {
BlockPosition blockposition = this.getSpawn();
int k = i * 16 + 8 - blockposition.getX();
@@ -2879,6 +2880,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -2887,6 +2888,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
return (LongSet) (forcedchunk != null ? LongSets.unmodifiable(forcedchunk.a()) : LongSets.EMPTY_SET);
}

18
Spigot-Server-Patches/0233-Add-ArmorStand-Item-Meta.patch
View File

@ -1,4 +1,4 @@
From b967d150c450a863735c634e3c5a7836e5d50772 Mon Sep 17 00:00:00 2001
From 380e7c43eb1131d830057dd981f0507f9c5b2722 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 27 Jan 2018 17:04:14 -0500
Subject: [PATCH] Add ArmorStand Item Meta
@ -13,7 +13,7 @@ starting point for future additions in this area.
Fixes GH-559
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index caaed7cf0..2672b004d 100644
index caaed7cf0b..2672b004db 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -191,6 +191,8 @@ public final class CraftItemFactory implements ItemFactory {
@ -26,7 +26,7 @@ index caaed7cf0..2672b004d 100644
case CHEST:
case TRAPPED_CHEST:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 2733cda40..e7daa9507 100644
index 2733cda407..e7daa95078 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -403,6 +403,8 @@ public final class CraftItemStack extends ItemStack {
@ -40,7 +40,7 @@ index 2733cda40..e7daa9507 100644
case TRAPPED_CHEST:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
new file mode 100644
index 000000000..0e8acf12e
index 0000000000..0e8acf12e4
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
@@ -0,0 +1,309 @@
@ -354,10 +354,10 @@ index 000000000..0e8acf12e
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 3fd208803..360e1fd54 100644
index 75669bd6ac..6593a52633 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -136,6 +136,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -137,6 +137,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
.put(CraftMetaCharge.class, "FIREWORK_EFFECT")
.put(CraftMetaKnowledgeBook.class, "KNOWLEDGE_BOOK")
.put(CraftMetaTropicalFishBucket.class, "TROPICAL_FISH_BUCKET")
@ -365,7 +365,7 @@ index 3fd208803..360e1fd54 100644
.put(CraftMetaItem.class, "UNSPECIFIC")
.build();
@@ -1095,7 +1096,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -1096,7 +1097,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
CraftMetaCharge.EXPLOSION.NBT,
CraftMetaBlockState.BLOCK_ENTITY_TAG.NBT,
CraftMetaKnowledgeBook.BOOK_RECIPES.NBT,
@ -383,7 +383,7 @@ index 3fd208803..360e1fd54 100644
}
return HANDLED_TAGS;
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
index 00f89f229..ef9d40b8a 100644
index 00f89f2296..ef9d40b8a0 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
@@ -6,6 +6,7 @@ import static org.hamcrest.Matchers.*;
@ -414,5 +414,5 @@ index 00f89f229..ef9d40b8a 100644
assertThat("Forgotten test?", providers, hasSize(ItemStackTest.COMPOUND_MATERIALS.length - 4/* Normal item meta, skulls, eggs and tile entities */));
--
2.18.0
2.19.0

10
Spigot-Server-Patches/0314-Ignore-Dead-Entities-in-entityList-iteration.patch
View File

@ -1,4 +1,4 @@
From 21e2b383c7c451aab9678a4611b4e8b675da0b0a Mon Sep 17 00:00:00 2001
From a558c61927e16dc35e3b766288e22aea83e0fd1b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 28 Jul 2018 12:18:27 -0400
Subject: [PATCH] Ignore Dead Entities in entityList iteration
@ -35,7 +35,7 @@ index 8951ac8095..127a7c9b72 100644
public float length;
public float J;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f21c7f8d90..79f7a678a7 100644
index fe81d4c7fc..653d594a6b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1105,6 +1105,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -67,9 +67,9 @@ index f21c7f8d90..79f7a678a7 100644
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
+ if (entity.shouldBeRemoved) continue; // Paper
if (!(entity instanceof EntityInsentient) || !((EntityInsentient) entity).isPersistent()) {
if (oclass.isAssignableFrom(entity.getClass())) {
// CraftBukkit start - Split out persistent check, don't apply it to special persistent mobs
if (entity instanceof EntityInsentient) {
EntityInsentient entityinsentient = (EntityInsentient) entity;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index af977b171a..80fd49b6e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java

10
Spigot-Server-Patches/0320-World-EntityHuman-Lookup-Optimizations.patch
View File

@ -1,11 +1,11 @@
From 9bdc7e711d66f2aabac9cde0b3723ef68105df87 Mon Sep 17 00:00:00 2001
From 7fc92c942588e2aaf3fa6c39a3b273310e63791c Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 30 Jul 2018 02:42:49 -0400
Subject: [PATCH] World EntityHuman Lookup Optimizations
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 79f7a678a7..e2ed2d3c1f 100644
index 653d594a6b..527cf942c8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -81,6 +81,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -41,7 +41,7 @@ index 79f7a678a7..e2ed2d3c1f 100644
this.everyoneSleeping();
}
@@ -2705,6 +2710,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -2713,6 +2718,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@Nullable
public EntityHuman a(String s) {
@ -50,7 +50,7 @@ index 79f7a678a7..e2ed2d3c1f 100644
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
@@ -2714,10 +2721,15 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -2722,10 +2729,15 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
}
return null;
@ -66,7 +66,7 @@ index 79f7a678a7..e2ed2d3c1f 100644
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
@@ -2727,6 +2739,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -2735,6 +2747,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
}
return null;

6
Spigot-Server-Patches/0326-Entity-add-to-world-fixes.patch
View File

@ -1,4 +1,4 @@
From d575c293eba242bce20368e93bf1c946bf9ee8cb Mon Sep 17 00:00:00 2001
From 509879ae5b406f8f259396441e29698419b6aa04 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 3 Aug 2018 22:47:46 -0400
Subject: [PATCH] Entity add to world fixes
@ -42,7 +42,7 @@ index e8af8f4196..56c3783412 100644
// CraftBukkit start
org.bukkit.Server server = this.world.getServer();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e2ed2d3c1f..2b7ab82b11 100644
index 527cf942c8..c565e46226 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1096,6 +1096,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -53,7 +53,7 @@ index e2ed2d3c1f..2b7ab82b11 100644
this.entityList.add(entity);
this.b(entity);
return true;
@@ -2493,9 +2494,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -2501,9 +2502,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
return j;
}

6
Spigot-Server-Patches/0353-Implement-Force-Loaded-Chunk-API.patch
View File

@ -1,14 +1,14 @@
From 7eec24b0570c9d4303505151fb9311021987f5c5 Mon Sep 17 00:00:00 2001
From 1e714f533e5ec45ad8afd9da552948fd1324fe33 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Wed, 29 Aug 2018 00:37:42 -0400
Subject: [PATCH] Implement Force-Loaded Chunk API
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9a99a56c14..9636b40f97 100644
index b75ed5028d..15df2b44af 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3009,6 +3009,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -3017,6 +3017,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
return forcedchunk != null && forcedchunk.a().contains(ChunkCoordIntPair.a(i, j));
}

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit a4bdecff654c72281fbce4cebf1ff55d86470d07
Subproject commit 94b8708aca2424734417b82a4e872c85740bde16