OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 23:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update B/CB

Browse source
This commit is contained in:
Shane Freeder 2018-02-24 04:03:32 +00:00
parent 24cdac9a0e
commit fab6cbe7e7
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
11 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch
View file

@ -1,11 +1,11 @@
From 5327fcad175af329bb3166193bd03cea317db5c2 Mon Sep 17 00:00:00 2001
From a25f3ed991c46a871bf580ae4ff7297fa93a4cc7 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 14:14:15 -0600
Subject: [PATCH] Drop falling block and tnt entities at the specified height
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 0094d1a8..4da84671 100644
index 0094d1a87..4da846719 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -113,4 +113,14 @@ public class PaperWorldConfig {
@ -24,10 +24,10 @@ index 0094d1a8..4da84671 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 4c794a09..90be4918 100644
index e09ced1a2..ab206417c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1751,6 +1751,7 @@ public abstract class Entity implements ICommandListener {
@@ -1750,6 +1750,7 @@ public abstract class Entity implements ICommandListener {
return this.a(new ItemStack(item, i, 0), f);
}
@ -36,7 +36,7 @@ index 4c794a09..90be4918 100644
public EntityItem a(ItemStack itemstack, float f) {
if (itemstack.isEmpty()) {
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index 579e51a0..2ba5d51a 100644
index 579e51a0a..2ba5d51a5 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -84,6 +84,17 @@ public class EntityFallingBlock extends Entity {
@ -58,7 +58,7 @@ index 579e51a0..2ba5d51a 100644
blockposition = new BlockPosition(this);
boolean flag = this.block.getBlock() == Blocks.dS;
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
index 44b2d473..0d70dd1d 100644
index 44b2d4735..0d70dd1d2 100644
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -57,6 +57,13 @@ public class EntityTNTPrimed extends Entity {
@ -76,5 +76,5 @@ index 44b2d473..0d70dd1d 100644
this.motY *= 0.9800000190734863D;
this.motZ *= 0.9800000190734863D;
--
2.14.3
2.16.2

20
Spigot-Server-Patches/0022-Entity-Origin-API.patch
View file

@ -1,11 +1,11 @@
From fd41ee4d876889ccaa0a1e76c921b3f0ceec80af Mon Sep 17 00:00:00 2001
From f3036166c54254edda6b097907cff5bc2e1e3639 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 90be4918..00487dd5 100644
index ab206417c..e3084445f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -149,6 +149,7 @@ public abstract class Entity implements ICommandListener {
@ -28,7 +28,7 @@ index 90be4918..00487dd5 100644
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
@@ -1689,6 +1695,13 @@ public abstract class Entity implements ICommandListener {
@@ -1688,6 +1694,13 @@ public abstract class Entity implements ICommandListener {
}
// CraftBukkit end
@ -42,7 +42,7 @@ index 90be4918..00487dd5 100644
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
@@ -1713,6 +1726,7 @@ public abstract class Entity implements ICommandListener {
@@ -1712,6 +1725,7 @@ public abstract class Entity implements ICommandListener {
protected abstract void b(NBTTagCompound nbttagcompound);
@ -51,7 +51,7 @@ index 90be4918..00487dd5 100644
NBTTagList nbttaglist = new NBTTagList();
double[] adouble1 = adouble;
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index 2ba5d51a..abdc2dea 100644
index 2ba5d51a5..abdc2dea9 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -267,6 +267,14 @@ public class EntityFallingBlock extends Entity {
@ -70,7 +70,7 @@ index 2ba5d51a..abdc2dea 100644
public void a(boolean flag) {
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
index 0d70dd1d..bb0904f8 100644
index 0d70dd1d2..bb0904f86 100644
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -109,6 +109,14 @@ public class EntityTNTPrimed extends Entity {
@ -89,7 +89,7 @@ index 0d70dd1d..bb0904f8 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
index bc638366..ca9eb2f3 100644
index bc6383669..ca9eb2f3b 100644
--- a/src/main/java/net/minecraft/server/NBTTagList.java
+++ b/src/main/java/net/minecraft/server/NBTTagList.java
@@ -153,6 +153,7 @@ public class NBTTagList extends NBTBase {
@ -101,7 +101,7 @@ index bc638366..ca9eb2f3 100644
if (i >= 0 && i < this.list.size()) {
NBTBase nbtbase = (NBTBase) this.list.get(i);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 26d4bd69..31b765de 100644
index 26d4bd690..31b765dea 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1071,6 +1071,12 @@ public abstract class World implements IBlockAccess {
@ -118,7 +118,7 @@ index 26d4bd69..31b765de 100644
flag = true;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 9958bf86..0f38abaf 100644
index c5a194ffe..00d842629 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -754,4 +754,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -135,5 +135,5 @@ index 9958bf86..0f38abaf 100644
+ // Paper end
}
--
2.14.3
2.16.2

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

@ -1,4 +1,4 @@
From f30a3addfcffdcb278c89d99217f9b3c6a9e9ab7 Mon Sep 17 00:00:00 2001
From cf2004f2b659ca6d14b06d1c5c5e79b16cbb0ac7 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 ec9a87239..b08274d93 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 438624dd7..9a1cac844 100644
index 8ca7324e9..293ac271d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2080,6 +2080,7 @@ public abstract class Entity implements ICommandListener {
@@ -2079,6 +2079,7 @@ public abstract class Entity implements ICommandListener {
@Nullable
public ScoreboardTeamBase aY() {
@ -49,5 +49,5 @@ index 438624dd7..9a1cac844 100644
}
--
2.14.3
2.16.2

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

@ -1,4 +1,4 @@
From a37aa06bbc370c134338ad5ed72958e0d3c312bd Mon Sep 17 00:00:00 2001
From e594a3257525209852256ac7ab6dcd50aaf7ed4c 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 05d764fa..a6d47213 100644
index 776e931c1..e1e918b21 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2356,7 +2356,7 @@ public abstract class Entity implements ICommandListener {
@@ -2355,7 +2355,7 @@ public abstract class Entity implements ICommandListener {
}
public Entity teleportTo(Location exit, boolean portal) {
@ -20,5 +20,5 @@ index 05d764fa..a6d47213 100644
WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
int i = worldserver1.dimension;
--
2.14.3
2.16.2

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

@ -1,4 +1,4 @@
From f792cc320c6dfc1bf48087e5379bc5b2255454cd Mon Sep 17 00:00:00 2001
From 2de4f92207050a52d5a48b1b0c1541d3e7a71505 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 abc1aabdd..6ea608ba9 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a6d472139..1d31bcde8 100644
index e1e918b21..dfdbbd733 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2079,6 +2079,7 @@ public abstract class Entity implements ICommandListener {
@@ -2078,6 +2078,7 @@ public abstract class Entity implements ICommandListener {
return this.getFlag(5);
}
@ -31,7 +31,7 @@ index a6d472139..1d31bcde8 100644
public ScoreboardTeamBase aY() {
if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 70fb4f6b0..187e59a08 100644
index 7c708a0de..9eb7b012f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1390,7 +1390,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -51,5 +51,5 @@ index 70fb4f6b0..187e59a08 100644
if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
for (Object recipient : minecraftServer.getPlayerList().players) {
--
2.14.3
2.16.2

10
Spigot-Server-Patches/0119-Vehicle-Event-Cancellation-Changes.patch
View file

@ -1,11 +1,11 @@
From 278380b38137c83f9bc3f02bfbef2d8a8b858f98 Mon Sep 17 00:00:00 2001
From c279234680e98b4f1fe19f9d4cd1257328dabb39 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 1d31bcde..06857c48 100644
index dfdbbd733..36c9bd418 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -70,7 +70,7 @@ public abstract class Entity implements ICommandListener {
@ -17,7 +17,7 @@ index 1d31bcde..06857c48 100644
public boolean attachedToPlayer;
public World world;
public double lastX;
@@ -1961,6 +1961,7 @@ public abstract class Entity implements ICommandListener {
@@ -1960,6 +1960,7 @@ public abstract class Entity implements ICommandListener {
throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
} else {
// CraftBukkit start
@ -25,7 +25,7 @@ index 1d31bcde..06857c48 100644
CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
Entity orig = craft == null ? null : craft.getHandle();
if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
@@ -1976,7 +1977,13 @@ public abstract class Entity implements ICommandListener {
@@ -1975,7 +1976,13 @@ public abstract class Entity implements ICommandListener {
}
}
// CraftBukkit end
@ -41,5 +41,5 @@ index 1d31bcde..06857c48 100644
entity.j = 60;
}
--
2.14.3
2.16.2

8
Spigot-Server-Patches/0133-Optional-TNT-doesn-t-move-in-water.patch
View file

@ -1,4 +1,4 @@
From 11ee9ef43abf1fcbe413d402b90df411ea4d02e8 Mon Sep 17 00:00:00 2001
From a3d2dc0a794ba024bb5b2bddb4cb06ea32ea1403 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 TNT doesn't move in water
@ -32,7 +32,7 @@ index 067cb233e..06acdaaf0 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ef096ef65..d46fb1d76 100644
index 65cee8cf0..4f4541a64 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1114,6 +1114,11 @@ public abstract class Entity implements ICommandListener {
@ -47,7 +47,7 @@ index ef096ef65..d46fb1d76 100644
if (this.bJ() 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)) {
@@ -2544,6 +2549,11 @@ public abstract class Entity implements ICommandListener {
@@ -2543,6 +2548,11 @@ public abstract class Entity implements ICommandListener {
}
public boolean bo() {
@ -114,5 +114,5 @@ index bb0904f86..50811852a 100644
+ // Paper end
}
--
2.16.1
2.16.2

8
Spigot-Server-Patches/0192-Don-t-allow-entities-to-ride-themselves-572.patch
View file

@ -1,14 +1,14 @@
From 052a2f49a21bef5a25211cda939ea96f90e5d1c5 Mon Sep 17 00:00:00 2001
From c20ed8397e8fb41958afded100db816ca70b2f17 Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Sun, 8 Jan 2017 04:31:36 +0000
Subject: [PATCH] Don't allow entities to ride themselves - #572
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9080006e5..a6ffe144f 100644
index 36914ed94..546059414 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1938,6 +1938,7 @@ public abstract class Entity implements ICommandListener {
@@ -1937,6 +1937,7 @@ public abstract class Entity implements ICommandListener {
}
protected void o(Entity entity) {
@ -17,5 +17,5 @@ index 9080006e5..a6ffe144f 100644
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
} else {
--
2.16.1
2.16.2

10
Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch
View file

@ -1,11 +1,11 @@
From 10d8c92db84bf780ee8477240e3698004cbce563 Mon Sep 17 00:00:00 2001
From 02fc93e13edbb0732f1c96cf475498644a2e4e83 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f08f4ae56..1f3aabd01 100644
index a5ed651dd..58fe1aa3e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener {
@ -27,7 +27,7 @@ index f08f4ae56..1f3aabd01 100644
// Paper end
return nbttagcompound;
} catch (Throwable throwable) {
@@ -1740,6 +1745,8 @@ public abstract class Entity implements ICommandListener {
@@ -1739,6 +1744,8 @@ public abstract class Entity implements ICommandListener {
if (!originTag.isEmpty()) {
origin = new Location(world.getWorld(), originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2));
}
@ -49,7 +49,7 @@ index a5261d70b..1ed0def1e 100644
if ( entity.world.spigotConfig.nerfSpawnerMobs )
{
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 8628cd5a2..6f06584ff 100644
index 14df5ff0d..1571e4eb5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -793,5 +793,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -64,5 +64,5 @@ index 8628cd5a2..6f06584ff 100644
// Paper end
}
--
2.16.1
2.16.2

2
work/Bukkit

@ -1 +1 @@
Subproject commit c03d8909d9822d1e8fe62a2e1550ae765f940893
Subproject commit 4751f9046965f288f477d331e5fd176bcbab85a7

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit bacaf9274bb3c83b40e84d1671f4958e8298a491
Subproject commit fb414fe101c10ff159d5cbec148a4d3f27ff990d