Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 12:36:07 +01:00
Code Issues Projects Releases Wiki Activity

[CI-SKIP] [Auto] Rebuild Patches

Browse Source 
A recent commit has been made that caused patches to be out of order, rebuilding
This commit is contained in:
Aikar 2020-07-04 22:02:02 -04:00
parent d43def7954
commit 030da7b896
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0353-Mob-Spawner-API-Enhancements.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Mob Spawner API Enhancements
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index e2f5354709819e56f9bc66b8c8d5e095bc8387b4..921abae4914c7b3f28d387f7a682d991293c4798 100644 index df5ac3295ea64fa9bb15f0565610265d55651b87..1ceee84d724142c8a9e969ac1ceb567b2a334a41 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -47,6 +47,7 @@ public abstract class MobSpawnerAbstract { @@ -47,6 +47,7 @@ public abstract class MobSpawnerAbstract {
@ -16,7 +16,7 @@ index e2f5354709819e56f9bc66b8c8d5e095bc8387b4..921abae4914c7b3f28d387f7a682d991
private boolean h() { private boolean h() {
BlockPosition blockposition = this.b(); BlockPosition blockposition = this.b();
@@ -207,6 +208,7 @@ public abstract class MobSpawnerAbstract { @@ -208,6 +209,7 @@ public abstract class MobSpawnerAbstract {
} }
} }
@ -24,7 +24,7 @@ index e2f5354709819e56f9bc66b8c8d5e095bc8387b4..921abae4914c7b3f28d387f7a682d991
private void i() { private void i() {
if (this.maxSpawnDelay <= this.minSpawnDelay) { if (this.maxSpawnDelay <= this.minSpawnDelay) {
this.spawnDelay = this.minSpawnDelay; this.spawnDelay = this.minSpawnDelay;
@@ -224,7 +226,13 @@ public abstract class MobSpawnerAbstract { @@ -225,7 +227,13 @@ public abstract class MobSpawnerAbstract {
} }
public void a(NBTTagCompound nbttagcompound) { public void a(NBTTagCompound nbttagcompound) {
@ -38,7 +38,7 @@ index e2f5354709819e56f9bc66b8c8d5e095bc8387b4..921abae4914c7b3f28d387f7a682d991
this.mobs.clear(); this.mobs.clear();
if (nbttagcompound.hasKeyOfType("SpawnPotentials", 9)) { if (nbttagcompound.hasKeyOfType("SpawnPotentials", 9)) {
NBTTagList nbttaglist = nbttagcompound.getList("SpawnPotentials", 10); NBTTagList nbttaglist = nbttagcompound.getList("SpawnPotentials", 10);
@@ -239,10 +247,15 @@ public abstract class MobSpawnerAbstract { @@ -240,10 +248,15 @@ public abstract class MobSpawnerAbstract {
} else if (!this.mobs.isEmpty()) { } else if (!this.mobs.isEmpty()) {
this.setSpawnData((MobSpawnerData) WeightedRandom.a(this.a().random, this.mobs)); this.setSpawnData((MobSpawnerData) WeightedRandom.a(this.a().random, this.mobs));
} }
@ -57,7 +57,7 @@ index e2f5354709819e56f9bc66b8c8d5e095bc8387b4..921abae4914c7b3f28d387f7a682d991
this.spawnCount = nbttagcompound.getShort("SpawnCount"); this.spawnCount = nbttagcompound.getShort("SpawnCount");
} }
@@ -267,9 +280,20 @@ public abstract class MobSpawnerAbstract { @@ -268,9 +281,20 @@ public abstract class MobSpawnerAbstract {
if (minecraftkey == null) { if (minecraftkey == null) {
return nbttagcompound; return nbttagcompound;
} else { } else {

4
Spigot-Server-Patches/0385-only-add-passanger-entities-once-from-spawners.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] only add passanger entities once from spawners
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index 921abae4914c7b3f28d387f7a682d991293c4798..2f1d168bd6daad1bbd41977b18263d1fe67a3da0 100644 index 1ceee84d724142c8a9e969ac1ceb567b2a334a41..17e5e1f191efd91b0797826cb96e5f230d622a0d 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -196,7 +196,7 @@ public abstract class MobSpawnerAbstract { @@ -197,7 +197,7 @@ public abstract class MobSpawnerAbstract {
} }
private void a(Entity entity) { private void a(Entity entity) {