SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Update to MC 1.10.2

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Zach Brown 2016-06-25 12:19:04 -05:00
Ursprung 0152e0f616
Commit 45d9b4c497
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: CC9DA35FC5450B76
30 geänderte Dateien mit 82 neuen und 138 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
Spigot-API-Patches/0001-POM-changes.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 0ab9576478ff7a43d94367022d1302d353729635 Mon Sep 17 00:00:00 2001
From eae2bbf6e1c174c7e0319f8e74c14ef1a305bbbd Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:16:08 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 0f5b26c..d6df6cb 100644
index 24f029d..93e12d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,37 @@
@ -24,7 +24,7 @@ index 0f5b26c..d6df6cb 100644
- <artifactId>spigot-api</artifactId>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.10-R0.1-SNAPSHOT</version>
<version>1.10.2-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>

8
Spigot-Server-Patches/0001-POM-Changes.patch
Datei anzeigen

@ -1,11 +1,11 @@
From ed260d61a8f87e73dc55565aff787e53b87b3037 Mon Sep 17 00:00:00 2001
From 888d6c40c7160d46ca8a0f64c5c0eda4129a841a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:40:33 -0600
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 9fa8bde..eb45129 100644
index 5dfa5b6..4ae34c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -17,7 +17,7 @@ index 9fa8bde..eb45129 100644
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper</artifactId>
<packaging>jar</packaging>
<version>1.10-R0.1-SNAPSHOT</version>
<version>1.10.2-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>http://www.spigotmc.org</url>
+ <name>Paper</name>
@ -194,5 +194,5 @@ index 9304637..674096c 100644
if (stream != null) {
--
2.8.3
2.9.0

18
Spigot-Server-Patches/0005-Timings-v2.patch
Datei anzeigen

@ -1,11 +1,11 @@
From f2a025a171a77bc14b98e605f6f9541cd56be33c Mon Sep 17 00:00:00 2001
From 63ab9112d936ab7a127b13225c325c527d899536 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
diff --git a/pom.xml b/pom.xml
index eb45129..34bfeb1 100644
index 4ae34c8..63aaa7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,12 @@
@ -293,7 +293,7 @@ index a106e44..d17160a 100644
public static int getId(Block block) {
return Block.REGISTRY.a(block); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 973e2c5..2e8deba 100644
index 0716cbc..a2bd64b 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -22,7 +22,7 @@ import java.io.PrintStream;
@ -465,7 +465,7 @@ index 5432e70..72cd51a 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c5adcc3..6ec5eae 100644
index 8cea6b5..455357b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -50,7 +50,7 @@ import org.apache.logging.log4j.Logger;
@ -778,7 +778,7 @@ index 42f37df..2b82312 100644
private static final Map<String, Class<? extends TileEntity>> f = Maps.newHashMap();
private static final Map<Class<? extends TileEntity>, String> g = Maps.newHashMap();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4dfe963..474c85b 100644
index e649435..b73f64e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@ -858,7 +858,7 @@ index 4dfe963..474c85b 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1610,7 +1615,6 @@ public abstract class World implements IBlockAccess {
@@ -1617,7 +1622,6 @@ public abstract class World implements IBlockAccess {
entity.ticksLived++;
entity.inactiveTick();
} else {
@ -866,7 +866,7 @@ index 4dfe963..474c85b 100644
// CraftBukkit end
entity.M = entity.locX;
entity.N = entity.locY;
@@ -1619,6 +1623,7 @@ public abstract class World implements IBlockAccess {
@@ -1626,6 +1630,7 @@ public abstract class World implements IBlockAccess {
entity.lastPitch = entity.pitch;
if (flag && entity.ab) {
++entity.ticksLived;
@ -874,7 +874,7 @@ index 4dfe963..474c85b 100644
if (entity.isPassenger()) {
entity.aw();
} else {
@@ -1677,8 +1682,6 @@ public abstract class World implements IBlockAccess {
@@ -1684,8 +1689,6 @@ public abstract class World implements IBlockAccess {
}
}
}
@ -1412,5 +1412,5 @@ index 30efc99..eb30abe 100644
}
}
--
2.8.3.windows.1
2.9.0

8
Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch
Datei anzeigen

@ -1,4 +1,4 @@
From a002ab51d4a94a1f228127a6c51279cfe506e461 Mon Sep 17 00:00:00 2001
From e5ce005823f066b5c88dfc06184f878f7d301501 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 21:20:21 -0600
Subject: [PATCH] Vanished players don't have rights
@ -75,10 +75,10 @@ index 3b6feb7..1450483 100644
IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 474c85b..9d6aefe 100644
index b73f64e..932e826 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1695,6 +1695,14 @@ public abstract class World implements IBlockAccess {
@@ -1702,6 +1702,14 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < list.size(); ++i) {
Entity entity1 = (Entity) list.get(i);
@ -94,5 +94,5 @@ index 474c85b..9d6aefe 100644
return false;
}
--
2.8.3.windows.1
2.9.0

14
Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 7653d093e465320d7d08f09d05c647a3f714801a Mon Sep 17 00:00:00 2001
From cb277aeafc3eac2cdb54872da1789d705f8dbcf3 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
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index cbceeca..cddc7f4 100644
index ffcc235..35f4647 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1,6 +1,7 @@
@ -111,7 +111,7 @@ index f8a871d..55c36fc 100644
biomebase_biomemeta = worldserver.a(enumcreaturetype, (BlockPosition) blockposition_mutableblockposition);
if (biomebase_biomemeta == null) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 558e700..d2953a7 100644
index 3e79e02..e3d971c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3,6 +3,7 @@
@ -122,7 +122,7 @@ index 558e700..d2953a7 100644
import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Calendar;
@@ -2706,16 +2707,31 @@ public abstract class World implements IBlockAccess {
@@ -2713,16 +2714,31 @@ public abstract class World implements IBlockAccess {
@Nullable
public EntityHuman findNearbyPlayer(Entity entity, double d0) {
@ -156,7 +156,7 @@ index 558e700..d2953a7 100644
double d4 = -1.0D;
EntityHuman entityhuman = null;
@@ -2727,6 +2743,8 @@ public abstract class World implements IBlockAccess {
@@ -2734,6 +2750,8 @@ public abstract class World implements IBlockAccess {
}
// CraftBukkit end
@ -165,7 +165,7 @@ index 558e700..d2953a7 100644
if ((IEntitySelector.d.apply(entityhuman1) || !flag) && (IEntitySelector.e.apply(entityhuman1) || flag)) {
double d5 = entityhuman1.e(d0, d1, d2);
@@ -2741,9 +2759,17 @@ public abstract class World implements IBlockAccess {
@@ -2748,9 +2766,17 @@ public abstract class World implements IBlockAccess {
}
public boolean isPlayerNearby(double d0, double d1, double d2, double d3) {
@ -205,5 +205,5 @@ index 6b3bbfe..11e3028 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.8.3.windows.1
2.9.0

12
Spigot-Server-Patches/0098-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 97e8ff8186b89c486bcc524a2c81c5864fd14ca4 Mon Sep 17 00:00:00 2001
From 0b1264d59ec8b3a917574f35aed221aaa3e592c5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:07:55 -0600
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@ -85,7 +85,7 @@ index bc55a2b..c7452d9 100644
IBlockData iblockdata = null;
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
index fc5c895..a12fa23 100644
index 3d784d0..afdc4a7 100644
--- a/src/main/java/net/minecraft/server/ChunkSection.java
+++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -5,7 +5,7 @@ public class ChunkSection {
@ -98,7 +98,7 @@ index fc5c895..a12fa23 100644
private NibbleArray skyLight;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 12f6761..54d1442 100644
index a3bce9a..b683c3e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -274,12 +274,12 @@ public abstract class World implements IBlockAccess {
@ -227,7 +227,7 @@ index 12f6761..54d1442 100644
public boolean B() {
return this.J < 4;
@@ -2051,7 +2060,7 @@ public abstract class World implements IBlockAccess {
@@ -2058,7 +2067,7 @@ public abstract class World implements IBlockAccess {
public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
@Nullable
public TileEntity getTileEntity(BlockPosition blockposition) {
@ -236,7 +236,7 @@ index 12f6761..54d1442 100644
return null;
} else {
// CraftBukkit start
@@ -2092,7 +2101,7 @@ public abstract class World implements IBlockAccess {
@@ -2099,7 +2108,7 @@ public abstract class World implements IBlockAccess {
}
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@ -245,7 +245,7 @@ index 12f6761..54d1442 100644
if (tileentity != null && !tileentity.x()) {
// CraftBukkit start
if (captureBlockStates) {
@@ -2155,7 +2164,7 @@ public abstract class World implements IBlockAccess {
@@ -2162,7 +2171,7 @@ public abstract class World implements IBlockAccess {
}
public boolean d(BlockPosition blockposition, boolean flag) {

27
Spigot-Server-Patches/0113-Use-Optimized-Collections.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 43f823f34760fd83d553efa9b943e2414813284d Mon Sep 17 00:00:00 2001
From 988e969f0fee60fce649abdf4a2b4cd65df96c1f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 30 Mar 2016 02:13:24 -0400
Subject: [PATCH] Use Optimized Collections
@ -26,25 +26,26 @@ index 36515cd..cc8602e 100644
private final IChunkLoader chunkLoader;
// Paper start
diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
index ec77a5c..86ad41d 100644
index 47968a8..1f5e6c0 100644
--- a/src/main/java/net/minecraft/server/DataWatcher.java
+++ b/src/main/java/net/minecraft/server/DataWatcher.java
@@ -12,13 +12,14 @@ import java.util.Map;
@@ -12,6 +12,7 @@ import java.util.Map;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.annotation.Nullable;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; // Paper
import org.apache.commons.lang3.ObjectUtils;
public class DataWatcher {
private static final Map<Class<? extends Entity>, Integer> a = Maps.newHashMap();
private final Entity b;
- private final Map<Integer, DataWatcher.Item<?>> c = Maps.newHashMap();
+ private final Map<Integer, DataWatcher.Item<?>> c = new Int2ObjectOpenHashMap<>(); // Paper
private final ReadWriteLock d = new ReentrantReadWriteLock();
private boolean e = true;
private boolean f;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -21,7 +22,7 @@ public class DataWatcher {
private static final Logger a = LogManager.getLogger();
private static final Map<Class<? extends Entity>, Integer> b = Maps.newHashMap();
private final Entity c;
- private final Map<Integer, DataWatcher.Item<?>> d = Maps.newHashMap();
+ private final Map<Integer, DataWatcher.Item<?>> d = new Int2ObjectOpenHashMap<>(); // Paper
private final ReadWriteLock e = new ReentrantReadWriteLock();
private boolean f = true;
private boolean g;
--
2.9.0

8
Spigot-Server-Patches/0118-Configurable-Keep-Spawn-Loaded-range-per-world.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 56f98f216eb1b94cbade9110cb3aeff4fd471b6f Mon Sep 17 00:00:00 2001
From dd61ef81706c1b9568bca67fd4f0f2fa0b333086 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
@ -21,7 +21,7 @@ index 2374419..d6fef83 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 64868c0..bfa6836 100644
index 62bbd14..cf5d86a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -353,8 +353,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -37,10 +37,10 @@ index 64868c0..bfa6836 100644
if (i1 - j > 1000L) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 8ba0d1f..2c6deef 100644
index 1dc8af1..bb578d9 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3242,8 +3242,9 @@ public abstract class World implements IBlockAccess {
@@ -3249,8 +3249,9 @@ public abstract class World implements IBlockAccess {
int k = i * 16 + 8 - blockposition.getX();
int l = j * 16 + 8 - blockposition.getZ();
boolean flag = true;

6
Spigot-Server-Patches/0120-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 980f9cd6c2c465296f3fc12611f285e7e9b3f573 Mon Sep 17 00:00:00 2001
From f1ca6b6520f378399d0a3945bca918c77ac6cc82 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 539100b..5400a53 100644
index 4452107..34b10c4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3238,6 +3238,7 @@ public abstract class World implements IBlockAccess {
@@ -3245,6 +3245,7 @@ public abstract class World implements IBlockAccess {
return this.N;
}

6
Spigot-Server-Patches/0125-Remove-unused-World-Tile-Entity-List.patch
Datei anzeigen

@ -1,4 +1,4 @@
From dec3a348a2c634b75a34149bd38eae2f214c0d08 Mon Sep 17 00:00:00 2001
From 8f60410ed03e1a461223e48993998701602db8ee Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 00:25:28 -0400
Subject: [PATCH] Remove unused World Tile Entity List
@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
Massive hit to performance and it is completely unnecessary.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5400a53..8479c6e 100644
index 34b10c4..71c5596 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -69,7 +69,7 @@ public abstract class World implements IBlockAccess {
@ -57,7 +57,7 @@ index 5400a53..8479c6e 100644
this.tileEntityListTick.add(tileentity);
}
@@ -2148,7 +2148,7 @@ public abstract class World implements IBlockAccess {
@@ -2155,7 +2155,7 @@ public abstract class World implements IBlockAccess {
} else {
if (tileentity != null) {
this.b.remove(tileentity);

6
Spigot-Server-Patches/0127-Fix-some-players-not-being-kicked-on-shutdown.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 9ca0316efd9a773e426f3327a6e2cd14c9d6aa86 Mon Sep 17 00:00:00 2001
From 7831132f199ac9b62f9403905bf5becf3824d51a Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 29 Mar 2016 20:19:20 -0400
Subject: [PATCH] Fix some players not being kicked on shutdown
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 540e178..5ff5017 100644
index 9865c4b..e6a4490 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1296,9 +1296,11 @@ public abstract class PlayerList {
@@ -1297,9 +1297,11 @@ public abstract class PlayerList {
}
public void u() {

2
Spigot-Server-Patches/0153-Avoid-blocking-on-Network-Manager-creation.patch → Spigot-Server-Patches/0152-Avoid-blocking-on-Network-Manager-creation.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 2ad56b9c1251e19cba94064d448640141c4e805d Mon Sep 17 00:00:00 2001
From 65bb8c055d3f07c5df69406f9969f0f09f40a54c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 16 May 2016 23:19:16 -0400
Subject: [PATCH] Avoid blocking on Network Manager creation

33
Spigot-Server-Patches/0152-MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch
Datei anzeigen

@ -1,33 +0,0 @@
From 3490ddd51256ba1788e4f8b0b7afee1f04f19498 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 16 May 2016 22:54:36 -0400
Subject: [PATCH] MC-99914 - ensure EntityItem loads before EntityPotion
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 234c547..691a78b 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -41,6 +41,7 @@ public class EntityItem extends Entity {
this.setItemStack(itemstack);
}
+ static int uglyHack = 1; // Paper - MC-99914 - ensure EntityItem loads before EntityPotion
protected boolean playStepSound() {
return false;
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e52b433..19757c5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -136,6 +136,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.dataConverterManager = dataconvertermanager;
// CraftBukkit start
this.options = options;
+ EntityItem.uglyHack++; // Paper - MC-99914 - ensure EntityItem loads before EntityPotion
// Try to see if we're actually running in a terminal, disable jline if not
if (System.console() == null && System.getProperty("jline.terminal") == null) {
System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
--
2.9.0

2
Spigot-Server-Patches/0154-Optional-old-TNT-cannon-behaviors.patch → Spigot-Server-Patches/0153-Optional-old-TNT-cannon-behaviors.patch
Datei anzeigen

@ -1,4 +1,4 @@
From d91fecdc72088d80f3f0ce7725970524513417d2 Mon Sep 17 00:00:00 2001
From 0b99c1d2c6975ae263684e303a29e592de348b90 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 22 May 2016 20:20:55 -0500
Subject: [PATCH] Optional old TNT cannon behaviors

2
Spigot-Server-Patches/0155-Faster-redstone-torch-rapid-clock-removal.patch → Spigot-Server-Patches/0154-Faster-redstone-torch-rapid-clock-removal.patch
Datei anzeigen

@ -1,4 +1,4 @@
From c4afaa0de50ca681f3872b7c424e9e049a05469a Mon Sep 17 00:00:00 2001
From a8db9e77254e61637f9d6dc91d32ffae503a906f Mon Sep 17 00:00:00 2001
From: Martin Panzer <postremus1996@googlemail.com>
Date: Mon, 23 May 2016 12:12:37 +0200
Subject: [PATCH] Faster redstone torch rapid clock removal

2
Spigot-Server-Patches/0156-Ensure-Chunks-never-ever-load-async.patch → Spigot-Server-Patches/0155-Ensure-Chunks-never-ever-load-async.patch
Datei anzeigen

@ -1,4 +1,4 @@
From ea485cf2940bdf54d4f7143860c44bb100c27749 Mon Sep 17 00:00:00 2001
From 25592434ec7fe95f5483120367d14d1edea8bcd3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 27 May 2016 21:41:26 -0400
Subject: [PATCH] Ensure Chunks never ever load async

2
Spigot-Server-Patches/0157-Add-server-name-parameter.patch → Spigot-Server-Patches/0156-Add-server-name-parameter.patch
Datei anzeigen

@ -1,4 +1,4 @@
From b58b5199f245fa8d5cea7b3cc0741ba9e589591a Mon Sep 17 00:00:00 2001
From 95181b1be4b40ab1f97c961e46e050b149058c06 Mon Sep 17 00:00:00 2001
From: Martin Panzer <postremus1996@googlemail.com>
Date: Sat, 28 May 2016 16:54:03 +0200
Subject: [PATCH] Add server-name parameter

2
Spigot-Server-Patches/0158-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch → Spigot-Server-Patches/0157-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 623109be2ae9e2d0333a56d797a67e5616f6dc59 Mon Sep 17 00:00:00 2001
From de41589e5bd952353fff7e4bfc4309b30248a425 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 31 May 2016 22:53:50 -0400
Subject: [PATCH] Only send Dragon/Wither Death sounds to same world

2
Spigot-Server-Patches/0159-Fix-FallingBlocks-being-stuck-on-fences.patch → Spigot-Server-Patches/0158-Fix-FallingBlocks-being-stuck-on-fences.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 550ed2c592716e42b0318ac613c2df70e1c02743 Mon Sep 17 00:00:00 2001
From 610fa07bea7c553af786537d9db36131aff1c1e5 Mon Sep 17 00:00:00 2001
From: Martin Panzer <postremus1996@googlemail.com>
Date: Fri, 3 Jun 2016 23:13:39 +0200
Subject: [PATCH] Fix FallingBlocks being stuck on fences

8
Spigot-Server-Patches/0161-Make-entities-look-for-hoppers.patch → Spigot-Server-Patches/0159-Make-entities-look-for-hoppers.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 002cc7e522a849abd35c3f69170c669965d89125 Mon Sep 17 00:00:00 2001
From 44e70ca5f30e4f5521e805856fba34836f16bb58 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sat, 18 Jun 2016 01:01:37 -0500
Subject: [PATCH] Make entities look for hoppers
@ -144,7 +144,7 @@ index e21769f..93f9eab 100644
public double motY;
public double motZ;
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 691a78b..6f474b4 100644
index 234c547..86be072 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -6,8 +6,15 @@ import javax.annotation.Nullable;
@ -164,7 +164,7 @@ index 691a78b..6f474b4 100644
private static final Logger b = LogManager.getLogger();
private static final DataWatcherObject<Optional<ItemStack>> c = DataWatcher.a(EntityItem.class, DataWatcherRegistry.f);
@@ -63,6 +70,7 @@ public class EntityItem extends Entity {
@@ -62,6 +69,7 @@ public class EntityItem extends Entity {
this.die();
} else {
super.m();
@ -172,7 +172,7 @@ index 691a78b..6f474b4 100644
// CraftBukkit start - Use wall time for pickup and despawn timers
int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
@@ -130,6 +138,7 @@ public class EntityItem extends Entity {
@@ -129,6 +137,7 @@ public class EntityItem extends Entity {
// Spigot start - copied from above
@Override
public void inactiveTick() {

24
Spigot-Server-Patches/0160-MC-80966-Always-send-chunk-sections.patch
Datei anzeigen

@ -1,24 +0,0 @@
From 506ce6cd06c9470e86bfb6daada661c52da34c39 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 11 Jun 2016 14:59:15 -0500
Subject: [PATCH] MC-80966 - Always send chunk sections
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
index a12fa23..27d0f99 100644
--- a/src/main/java/net/minecraft/server/ChunkSection.java
+++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -64,7 +64,9 @@ public class ChunkSection {
}
public boolean a() {
- return this.nonEmptyBlockCount == 0;
+ // Paper - MC-80966
+ // Even if there are no blocks, there may be other information associated with the chunk, always send it.
+ return false;
}
public boolean shouldTick() {
--
2.9.0

2
Spigot-Server-Patches/0162-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch → Spigot-Server-Patches/0160-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 309155e60dfea8ae854c916ea11bac7420f07cf1 Mon Sep 17 00:00:00 2001
From ba5e8b5f94fadd4ed864bfe5fa20d774afacd116 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 18 Jun 2016 01:49:22 -0400
Subject: [PATCH] Remove the item from the correct hand when spawn egg depletes

2
Spigot-Server-Patches/0163-Delay-Chunk-Unloads-based-on-Player-Movement.patch → Spigot-Server-Patches/0161-Delay-Chunk-Unloads-based-on-Player-Movement.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 776d47ca497b193b30704249cfcab519e46200fa Mon Sep 17 00:00:00 2001
From f47ee0562a94a603a3ed8a4e695f05941871c283 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 18 Jun 2016 23:22:12 -0400
Subject: [PATCH] Delay Chunk Unloads based on Player Movement

2
Spigot-Server-Patches/0164-Toggleable-Elytra-Wall-Damage.patch → Spigot-Server-Patches/0162-Toggleable-Elytra-Wall-Damage.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 9ad9d1c4d3ace74fd385eaa812a67d6d877f0ffc Mon Sep 17 00:00:00 2001
From d11dffe661160ffca87ac3040088bbae3033ca11 Mon Sep 17 00:00:00 2001
From: Jadon Fowler <jadonflower@gmail.com>
Date: Sat, 18 Jun 2016 23:13:59 -0700
Subject: [PATCH] Toggleable Elytra Wall Damage

6
Spigot-Server-Patches/0165-Fix-Double-World-Add-issues.patch → Spigot-Server-Patches/0163-Fix-Double-World-Add-issues.patch
Datei anzeigen

@ -1,4 +1,4 @@
From d4a8a16b2f72409f3efd372e4ac6536670da3a45 Mon Sep 17 00:00:00 2001
From 9da78f3ccd27315e302b125de518bab9738738a5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 21 Jun 2016 22:54:34 -0400
Subject: [PATCH] Fix Double World Add issues
@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
Also add debug if something else tries to, and abort before world gets bad state
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 940f4e9..584a77d 100644
index d68bd28..978e7ab 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -527,7 +527,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -21,7 +21,7 @@ index 940f4e9..584a77d 100644
Iterator iterator = entity.bx().iterator();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 98fe386..b3d4f86 100644
index 1d47a117..f7d9a7c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1039,6 +1039,7 @@ public abstract class World implements IBlockAccess {

2
Spigot-Server-Patches/0166-Fix-Old-Sign-Conversion.patch → Spigot-Server-Patches/0164-Fix-Old-Sign-Conversion.patch
Datei anzeigen

@ -1,4 +1,4 @@
From fd1debef91f761ee781e4a813adf0309f388853a Mon Sep 17 00:00:00 2001
From d96b5d305be2afc856d652f1f746f62011e74fec Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 17 Jun 2016 20:50:11 -0400
Subject: [PATCH] Fix Old Sign Conversion

2
work/BuildData

@ -1 +1 @@
Subproject commit cede5450c952c76341e047b8d04f9894f16e596d
Subproject commit f37e6395d8f7d4865df27a4ab77e0c0d45de8fb9

2
work/Bukkit

@ -1 +1 @@
Subproject commit da1195392ac6db7015a83165a01b9c62b8380a24
Subproject commit c3a46c9b8db54daf9425d73aa593e494f809bbde

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 1953f52da1ece0feb56dea20592c1b86616b31a5
Subproject commit 4c1e9342cbe16f4c83d9360e3a21283d3fd80e50

2
work/Spigot

@ -1 +1 @@
Subproject commit c3e4052b69acbcf52439c51ae8b0d65a4b1bb98a
Subproject commit 687a0190ef59611cca4cba981e17b4881c51df17