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

Update to Paper to MC 1.11.2

Browse Source
This commit is contained in:
Zach Brown 2016-12-21 11:21:40 -06:00
parent 98e7d01ce8
commit cae453c16b
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
13 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-API-Patches/0001-POM-changes.patch
View File

@ -1,11 +1,11 @@
From 75d4b845b027f8df6561282a96dd6ede8c272b2f Mon Sep 17 00:00:00 2001
From e9476e0764a94d5000a6add8386864f4fe8d8b88 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 65839cb..c32903b 100644
index 28d2a57..0b6fd28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,37 @@
@ -24,7 +24,7 @@ index 65839cb..c32903b 100644
- <artifactId>spigot-api</artifactId>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.11.1-R0.1-SNAPSHOT</version>
<version>1.11.2-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>

6
Spigot-Server-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From 5369c4021cb5d9ddea75547f5357b4c6ed5e0885 Mon Sep 17 00:00:00 2001
From 1f8f0180d8a5714931673fe8fabce687a0c24095 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 2b0fc8f..4fe3d8c 100644
index 6d019d1..0e88ae2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -17,7 +17,7 @@ index 2b0fc8f..4fe3d8c 100644
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper</artifactId>
<packaging>jar</packaging>
<version>1.11.1-R0.1-SNAPSHOT</version>
<version>1.11.2-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>http://www.spigotmc.org</url>
+ <name>Paper</name>

16
Spigot-Server-Patches/0005-Timings-v2.patch
View File

@ -1,11 +1,11 @@
From 4660534c254ab344d692fba1eb56b0343f4edf21 Mon Sep 17 00:00:00 2001
From 69fff7baefbcf449770b42b9bad997db9c2d006e 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 4fe3d8c..d717dd8 100644
index 0e88ae2..31b8401 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,12 @@
@ -515,7 +515,7 @@ index b39937f..17d39bb 100644
this.chunkLoader.a(this.world, chunk);
} catch (IOException ioexception) {
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 69387ea..66d0022 100644
index a97e7d3..4890023 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -555,7 +555,7 @@ index 69387ea..66d0022 100644
// return chunk; // CraftBukkit
}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index c6a8345..363415f 100644
index cb83e4f..4dab9e9 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -23,7 +23,7 @@ import java.io.PrintStream;
@ -586,7 +586,7 @@ index c6a8345..363415f 100644
public boolean aa() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e89dd7b..f86fe82 100644
index dd946b9..4d28933 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
@ -616,7 +616,7 @@ index e89dd7b..f86fe82 100644
if (this.noclip) {
this.a(this.getBoundingBox().d(d0, d1, d2));
this.recalcPosition();
@@ -869,7 +869,6 @@ public abstract class Entity implements ICommandListener {
@@ -867,7 +867,6 @@ public abstract class Entity implements ICommandListener {
this.world.methodProfiler.b();
}
@ -727,7 +727,7 @@ index 347a2b6..aceb08c 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4d3f403..f2b13b3 100644
index 90b6678..9e3a8d1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -47,7 +47,7 @@ import org.bukkit.Bukkit;
@ -1103,7 +1103,7 @@ index 6958a2e..b3d3df4 100644
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index dcd6fc1..1867593 100644
index b6ae070..77ad8d6 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;

12
Spigot-Server-Patches/0023-Entity-Origin-API.patch
View File

@ -1,11 +1,11 @@
From aab99807faf78b09a62df2570b2b70ea5551b67c Mon Sep 17 00:00:00 2001
From 3bd1d97ca60e0d62df26c12863eb8d7b6138a903 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 23:45:08 -0600
Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f86fe82..537adb5 100644
index 4d28933..26e0702 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -147,6 +147,7 @@ public abstract class Entity implements ICommandListener {
@ -16,7 +16,7 @@ index f86fe82..537adb5 100644
// Spigot start
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
@@ -1469,6 +1470,11 @@ public abstract class Entity implements ICommandListener {
@@ -1465,6 +1466,11 @@ public abstract class Entity implements ICommandListener {
}
}
@ -28,7 +28,7 @@ index f86fe82..537adb5 100644
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
@@ -1613,6 +1619,13 @@ public abstract class Entity implements ICommandListener {
@@ -1609,6 +1615,13 @@ public abstract class Entity implements ICommandListener {
}
// CraftBukkit end
@ -42,7 +42,7 @@ index f86fe82..537adb5 100644
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
@@ -1637,6 +1650,7 @@ public abstract class Entity implements ICommandListener {
@@ -1633,6 +1646,7 @@ public abstract class Entity implements ICommandListener {
protected abstract void b(NBTTagCompound nbttagcompound);
@ -89,7 +89,7 @@ index fd07356..25e471d 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1a6803a..629ea2e 100644
index 2010fdd..a842ebd 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess {

6
Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch
View File

@ -1,4 +1,4 @@
From e8122a81295e843f89f0360bf8362bec86163d8f Mon Sep 17 00:00:00 2001
From a463d6b3c11cd75c9a5ba0f5f7b895c5e45d7374 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 8 Mar 2016 23:25:45 -0500
Subject: [PATCH] Disable Scoreboards for non players by default
@ -37,10 +37,10 @@ index 7af5d0a..ab9aa13 100644
if (scoreboard.addPlayerToTeam(s2, s)) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1b37b60..453efd4 100644
index e8f5044..ced9d99 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2003,6 +2003,7 @@ public abstract class Entity implements ICommandListener {
@@ -1999,6 +1999,7 @@ public abstract class Entity implements ICommandListener {
@Nullable
public ScoreboardTeamBase aQ() {

6
Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch
View File

@ -1,4 +1,4 @@
From 26efaa8237ce8a3753a799211df5ad4c20625141 Mon Sep 17 00:00:00 2001
From 1f1a23cdb676e0278f516e3a4cde83467aa54a07 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 22 Mar 2016 00:55:23 -0400
Subject: [PATCH] Don't teleport dead entities
@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic.
Potentially an old CB change that's no longer needed.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 64b682e..0612618 100644
index 1bc7338..ac10fec 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2269,7 +2269,7 @@ public abstract class Entity implements ICommandListener {
@@ -2265,7 +2265,7 @@ public abstract class Entity implements ICommandListener {
}
public Entity teleportTo(Location exit, boolean portal) {

6
Spigot-Server-Patches/0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
View File

@ -1,4 +1,4 @@
From 770da0e07c4eab5c4420fde8e767ba9e4e18d80f Mon Sep 17 00:00:00 2001
From 50c227471b14fccfc5d99d73649dc34c34f01492 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 6 Apr 2016 01:04:23 -0500
Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@ -19,10 +19,10 @@ index 6517c32..ea254a7 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0612618..d594dd6 100644
index ac10fec..ae6638d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2002,6 +2002,7 @@ public abstract class Entity implements ICommandListener {
@@ -1998,6 +1998,7 @@ public abstract class Entity implements ICommandListener {
return this.getFlag(5);
}

14
Spigot-Server-Patches/0124-Vehicle-Event-Cancellation-Changes.patch
View File

@ -1,14 +1,14 @@
From 0ad7ae5cfa417df14a045c10ebc7891bc3978d09 Mon Sep 17 00:00:00 2001
From 6b61c540e2b3ce1833af6411ba1627ac98ab08d3 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 22 Apr 2016 18:20:05 -0500
Subject: [PATCH] Vehicle Event Cancellation Changes
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d594dd6..78b3b3a 100644
index ae6638d..3e20704 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1807,6 +1807,10 @@ public abstract class Entity implements ICommandListener {
@@ -1803,6 +1803,10 @@ public abstract class Entity implements ICommandListener {
}
}
@ -19,7 +19,7 @@ index d594dd6..78b3b3a 100644
if (!flag && (!this.n(entity) || !entity.q(this))) {
return false;
} else {
@@ -1815,7 +1819,7 @@ public abstract class Entity implements ICommandListener {
@@ -1811,7 +1815,7 @@ public abstract class Entity implements ICommandListener {
}
this.au = entity;
@ -28,7 +28,7 @@ index d594dd6..78b3b3a 100644
return true;
}
}
@@ -1842,12 +1846,20 @@ public abstract class Entity implements ICommandListener {
@@ -1838,12 +1842,20 @@ public abstract class Entity implements ICommandListener {
}
protected void o(Entity entity) {
@ -49,7 +49,7 @@ index d594dd6..78b3b3a 100644
CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
Entity orig = craft == null ? null : craft.getHandle();
if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, false)) { // Boolean not used
@@ -1870,6 +1882,8 @@ public abstract class Entity implements ICommandListener {
@@ -1866,6 +1878,8 @@ public abstract class Entity implements ICommandListener {
return;
}
// Spigot end
@ -58,7 +58,7 @@ index d594dd6..78b3b3a 100644
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bw() instanceof EntityHuman)) {
this.passengers.add(0, entity);
} else {
@@ -1895,16 +1909,29 @@ public abstract class Entity implements ICommandListener {
@@ -1891,16 +1905,29 @@ public abstract class Entity implements ICommandListener {
CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
Entity n = craftn == null ? null : craftn.getHandle();
if (event.isCancelled() || n != orig) {

12
Spigot-Server-Patches/0140-Optional-old-TNT-cannon-behaviors.patch
View File

@ -1,4 +1,4 @@
From b2b00d76f826e798b5f3f1051957d1c43959f1ea Mon Sep 17 00:00:00 2001
From 0c284c4378d5a4660ee4ab4c3b45874d64d4ce58 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
@ -207,10 +207,10 @@ index dbfb8ab..537408a 100644
world.getServer().getPluginManager().callEvent(event);
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 4907b24..a6f6313 100644
index 0a6fbf1..768d89d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1043,6 +1043,12 @@ public abstract class Entity implements ICommandListener {
@@ -1041,6 +1041,12 @@ public abstract class Entity implements ICommandListener {
}
public boolean ak() {
@ -223,7 +223,7 @@ index 4907b24..a6f6313 100644
if (this.bB() instanceof EntityBoat) {
this.inWater = false;
} else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) {
@@ -1248,6 +1254,12 @@ public abstract class Entity implements ICommandListener {
@@ -1244,6 +1250,12 @@ public abstract class Entity implements ICommandListener {
}
public double e(double d0, double d1, double d2) {
@ -236,7 +236,7 @@ index 4907b24..a6f6313 100644
double d3 = this.locX - d0;
double d4 = this.locY - d1;
double d5 = this.locZ - d2;
@@ -1302,6 +1314,11 @@ public abstract class Entity implements ICommandListener {
@@ -1298,6 +1310,11 @@ public abstract class Entity implements ICommandListener {
}
public void f(double d0, double d1, double d2) {
@ -248,7 +248,7 @@ index 4907b24..a6f6313 100644
this.motX += d0;
this.motY += d1;
this.motZ += d2;
@@ -2477,6 +2494,12 @@ public abstract class Entity implements ICommandListener {
@@ -2473,6 +2490,12 @@ public abstract class Entity implements ICommandListener {
}
public boolean bg() {

2
work/BuildData

@ -1 +1 @@
Subproject commit bc05720eba5ca92c3f0da3b21314876c509111a1
Subproject commit c7f29d05017084c03eb1424919ba41ed622442d8

2
work/Bukkit

@ -1 +1 @@
Subproject commit 506e9411267240a81a016a47b2c093bedad50a81
Subproject commit d515d2edded08e7f5036dd6da305e667ffa6b21a

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit fb50a80d0f81afb2018b543e68fd4cc5b7b5169d
Subproject commit a86731306b138fa78c130aa942bb1100cad2989f

2
work/Spigot

@ -1 +1 @@
Subproject commit 9deaa4c15ed177075d5b3906878a888571ab1a5e
Subproject commit 7d78b81e398e61a69a774f05f427c24f0debd4fd