mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update upstream B/CB

Browse source
This commit is contained in:
Zach Brown 2016-09-04 16:59:06 -05:00
parent e153f46603
commit eb7e4424fa
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
10 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Spigot-Server-Patches/0005-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From bcf58a57e761e7607e15baa7a62d92aea8f430d0 Mon Sep 17 00:00:00 2001
From 374f421a7115fbc6e66d34e36cb6276a1adebb75 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
@ -371,7 +371,7 @@ index 0000000..36aafb2
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 0468372..7739e78 100644
index 2de9b21..858eb9a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@ -554,7 +554,7 @@ index 11a49a3..e70d5c5 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 bb9e6b9..1e85d39 100644
index f96dafc..c35f073 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace;
@ -584,7 +584,7 @@ index bb9e6b9..1e85d39 100644
if (this.noclip) {
this.a(this.getBoundingBox().c(d0, d1, d2));
this.recalcPosition();
@@ -805,7 +805,6 @@ public abstract class Entity implements ICommandListener {
@@ -803,7 +803,6 @@ public abstract class Entity implements ICommandListener {
this.world.methodProfiler.b();
}
@ -1736,5 +1736,5 @@ index 30efc99..eb30abe 100644
}
}
--
2.9.2.windows.1
2.10.0.windows.1

12
Spigot-Server-Patches/0026-Entity-Origin-API.patch
View file

@ -1,11 +1,11 @@
From 04d506ad53de647f48493f06fbd2ecea6465f0fb Mon Sep 17 00:00:00 2001
From fbab4ca7a4c094c2b6f537d701af390f8e33c8cc 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 1e85d39..395811a 100644
index c35f073..38df1c6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -145,6 +145,7 @@ public abstract class Entity implements ICommandListener {
@ -16,7 +16,7 @@ index 1e85d39..395811a 100644
// Spigot start
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
@@ -1373,6 +1374,11 @@ public abstract class Entity implements ICommandListener {
@@ -1371,6 +1372,11 @@ public abstract class Entity implements ICommandListener {
}
}
@ -28,7 +28,7 @@ index 1e85d39..395811a 100644
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
@@ -1517,6 +1523,13 @@ public abstract class Entity implements ICommandListener {
@@ -1515,6 +1521,13 @@ public abstract class Entity implements ICommandListener {
}
// CraftBukkit end
@ -42,7 +42,7 @@ index 1e85d39..395811a 100644
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
@@ -1538,6 +1551,7 @@ public abstract class Entity implements ICommandListener {
@@ -1536,6 +1549,7 @@ public abstract class Entity implements ICommandListener {
protected abstract void b(NBTTagCompound nbttagcompound);
@ -155,5 +155,5 @@ index c493c9c..93843aa 100644
+ // Paper end
}
--
2.9.2.windows.1
2.10.0.windows.1

8
Spigot-Server-Patches/0070-Disable-Scoreboards-for-non-players-by-default.patch
View file

@ -1,4 +1,4 @@
From 1004124199af96178875ccfa205bbd2b881fdba0 Mon Sep 17 00:00:00 2001
From 90efcaee9d494cc9c411001c68a80095c498aa5d 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 5f579bc..8e5419d 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 cc484dc..e1cc3fd 100644
index 14c2d2c..232ba8e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1895,6 +1895,7 @@ public abstract class Entity implements ICommandListener {
@@ -1893,6 +1893,7 @@ public abstract class Entity implements ICommandListener {
@Nullable
public ScoreboardTeamBase aQ() {
@ -49,5 +49,5 @@ index cc484dc..e1cc3fd 100644
}
--
2.9.2.windows.1
2.10.0.windows.1

8
Spigot-Server-Patches/0093-Don-t-teleport-dead-entities.patch
View file

@ -1,4 +1,4 @@
From a4255bbf6008b8eef25c4aeb9cc78e54621c28a8 Mon Sep 17 00:00:00 2001
From 8e4e9acbf0011264d6385b2b79b26726cff04415 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 a331888..ffae109 100644
index fab8eb4..1106bd8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2151,7 +2151,7 @@ public abstract class Entity implements ICommandListener {
@@ -2149,7 +2149,7 @@ public abstract class Entity implements ICommandListener {
}
public Entity teleportTo(Location exit, boolean portal) {
@ -20,5 +20,5 @@ index a331888..ffae109 100644
WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
int i = worldserver1.dimension;
--
2.9.2.windows.1
2.10.0.windows.1

8
Spigot-Server-Patches/0120-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
View file

@ -1,4 +1,4 @@
From 7dcf96b882df0d252851dd1f5362fda7f74e7688 Mon Sep 17 00:00:00 2001
From d2d0657eeb709504ef94fef87c8a2f8f8410de33 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 84694b2..64e20d5 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ffae109..34c00eb 100644
index 1106bd8..a17355c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1894,6 +1894,7 @@ public abstract class Entity implements ICommandListener {
@@ -1892,6 +1892,7 @@ public abstract class Entity implements ICommandListener {
return this.getFlag(5);
}
@ -51,5 +51,5 @@ index b983540..999f381 100644
if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
for (Object recipient : minecraftServer.getPlayerList().players) {
--
2.9.2.windows.1
2.10.0.windows.1

16
Spigot-Server-Patches/0134-Vehicle-Event-Cancellation-Changes.patch
View file

@ -1,14 +1,14 @@
From d480ba769c9926c058a200076480f9886c522ef5 Mon Sep 17 00:00:00 2001
From a721a2a4c936858a894fe43395ff86fe8fd5f99d 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 b38cb3f..10d732f 100644
index 66337e4..afbc204 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1700,6 +1700,10 @@ public abstract class Entity implements ICommandListener {
@@ -1698,6 +1698,10 @@ public abstract class Entity implements ICommandListener {
}
public boolean a(Entity entity, boolean flag) {
@ -19,7 +19,7 @@ index b38cb3f..10d732f 100644
if (!flag && (!this.n(entity) || !entity.q(this))) {
return false;
} else {
@@ -1708,7 +1712,7 @@ public abstract class Entity implements ICommandListener {
@@ -1706,7 +1710,7 @@ public abstract class Entity implements ICommandListener {
}
this.au = entity;
@ -28,7 +28,7 @@ index b38cb3f..10d732f 100644
return true;
}
}
@@ -1735,12 +1739,20 @@ public abstract class Entity implements ICommandListener {
@@ -1733,12 +1737,20 @@ public abstract class Entity implements ICommandListener {
}
protected void o(Entity entity) {
@ -49,7 +49,7 @@ index b38cb3f..10d732f 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
@@ -1763,6 +1775,8 @@ public abstract class Entity implements ICommandListener {
@@ -1761,6 +1773,8 @@ public abstract class Entity implements ICommandListener {
return;
}
// Spigot end
@ -58,7 +58,7 @@ index b38cb3f..10d732f 100644
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bw() instanceof EntityHuman)) {
this.passengers.add(0, entity);
} else {
@@ -1788,16 +1802,29 @@ public abstract class Entity implements ICommandListener {
@@ -1786,16 +1800,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) {
@ -90,5 +90,5 @@ index b38cb3f..10d732f 100644
return this.bx().size() < 1;
}
--
2.9.2.windows.1
2.10.0.windows.1

14
Spigot-Server-Patches/0150-Optional-old-TNT-cannon-behaviors.patch
View file

@ -1,4 +1,4 @@
From 9c2bf893798e06ec1986b24a575f0e54bdef1d88 Mon Sep 17 00:00:00 2001
From cf538b617c3412544b4ec983d5b7f8347d71db55 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
@ -208,10 +208,10 @@ index 03ce337..588c0e9 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 68f9175..41ef058 100644
index 059042e..7fc3e57 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -980,6 +980,12 @@ public abstract class Entity implements ICommandListener {
@@ -978,6 +978,12 @@ public abstract class Entity implements ICommandListener {
}
public boolean ak() {
@ -224,7 +224,7 @@ index 68f9175..41ef058 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)) {
@@ -1181,6 +1187,12 @@ public abstract class Entity implements ICommandListener {
@@ -1179,6 +1185,12 @@ public abstract class Entity implements ICommandListener {
}
public double f(double d0, double d1, double d2) {
@ -237,7 +237,7 @@ index 68f9175..41ef058 100644
double d3 = this.locX - d0;
double d4 = this.locY - d1;
double d5 = this.locZ - d2;
@@ -1235,6 +1247,12 @@ public abstract class Entity implements ICommandListener {
@@ -1233,6 +1245,12 @@ public abstract class Entity implements ICommandListener {
}
public void g(double d0, double d1, double d2) {
@ -250,7 +250,7 @@ index 68f9175..41ef058 100644
this.motX += d0;
this.motY += d1;
this.motZ += d2;
@@ -2360,6 +2378,12 @@ public abstract class Entity implements ICommandListener {
@@ -2358,6 +2376,12 @@ public abstract class Entity implements ICommandListener {
}
public boolean bg() {
@ -391,5 +391,5 @@ index 6cdc3a3..0b9bc91 100644
EntityHuman entityhuman = (EntityHuman) entity;
--
2.9.2.windows.1
2.10.0.windows.1

8
Spigot-Server-Patches/0169-Convert-new-health-to-a-float-during-set.patch
View file

@ -1,9 +1,9 @@
From 04533a98c1be92ba73a9ce4cde2ee8759500cbde Mon Sep 17 00:00:00 2001
From f875aa3ec413dd58b41f26cb298e7969bee22bed Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 1 Sep 2016 09:51:31 +0000
Subject: [PATCH] Convert new health to a float during set Convert the new
health value to a float before doing any validation logic
Subject: [PATCH] Convert new health to a float during set
Convert the new health value to a float before doing any validation logic
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index b807a3f..9e19e7c 100644
@ -18,5 +18,5 @@ index b807a3f..9e19e7c 100644
// Paper - Be more informative
throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
--
2.5.0
2.10.0.windows.1

2
work/Bukkit

@ -1 +1 @@
Subproject commit a25e56c4b6133c9e77d0c71fc0b1db1ace430197
Subproject commit 9fdd2ce60dbe09ee2a44cba21f409a18fd159cdc

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 4d87c3422c4f3d0576c63859e12e37c29031bbad
Subproject commit 48b88ed202ac122eea91d55b61c411e519ac2796