core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream B/CB

This commit is contained in:
Zach Brown 2018-07-13 02:39:44 -05:00
parent db4ecc9d9d
commit 5b02e5736a
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
20 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From 43344bd333e548df23d8a9d68833c74d63d84964 Mon Sep 17 00:00:00 2001
From 7836876ec5222a072d9d65d965f4edcc0ea8bbe4 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 73ef3193..4220760f 100644
index 7c81917d..4c5bda27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,39 +3,39 @@
@ -146,8 +146,8 @@ index 73ef3193..4220760f 100644
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
- <version>1.1</version>
- <artifactId>java17</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
@ -157,5 +157,5 @@ index 73ef3193..4220760f 100644
- </profiles>
</project>
--
2.15.1.windows.2
2.18.0

8
Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch
View File

@ -1,4 +1,4 @@
From 16c613ce58c5d072bff472f8e249ffa206ea814d Mon Sep 17 00:00:00 2001
From 8279699f108090fb3522612b8d574c50685e1ee2 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 10 Jun 2017 16:59:40 -0500
Subject: [PATCH] Fix upstream javadoc warnings and errors
@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
index 19632d17..de1b1112 100644
index 1ed8f7e4..bd5238ce 100644
--- a/src/main/java/org/bukkit/NamespacedKey.java
+++ b/src/main/java/org/bukkit/NamespacedKey.java
@@ -27,8 +27,8 @@ public final class NamespacedKey {
@@ -38,8 +38,8 @@ public final class NamespacedKey {
/**
* Create a key in a specific namespace.
*
@ -348,5 +348,5 @@ index 92174e81..ac5cc32c 100644
ChatColor getColor() throws IllegalStateException;
--
2.17.1
2.18.0

14
Spigot-Server-Patches/0009-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From fef89f722e865197552f6950ab3cd6a2a74961fa Mon Sep 17 00:00:00 2001
From e22eabf390b42d414ad3af7a6d453ef84da87692 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
@ -442,7 +442,7 @@ index 2dca6dbcb..352310960 100644
public static int getId(Block block) {
return Block.REGISTRY.a(block); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index cbb1f2cae..ca5a42377 100644
index f540b14a2..472b9c1c3 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -937,7 +937,7 @@ public class Chunk {
@ -596,7 +596,7 @@ index e1cb96a88..8f2afcc32 100644
return waitable.get();
} catch (java.util.concurrent.ExecutionException e) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3829c8c40..8dcff9bd4 100644
index f140d5e28..05aad7dd0 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;
@ -984,7 +984,7 @@ index eeac34998..e4ed2e991 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cd2d58bfb..da25a8bea 100644
index ec3e08336..dacf9261a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -1128,7 +1128,7 @@ index 74e3f42cd..66a80a776 100644
return flag;
}
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 88cd5734d..c1f657808 100644
index d7132c3c0..15f18ba1d 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@ -1648,7 +1648,7 @@ index 3a95b4465..b5efb9c3f 100644
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2d5dc2179..916781403 100644
index 137b101a7..cd99801ff 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -41,7 +41,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@ -1660,7 +1660,7 @@ index 2d5dc2179..916781403 100644
import org.bukkit.craftbukkit.block.CraftSign;
import org.bukkit.craftbukkit.conversations.ConversationTracker;
import org.bukkit.craftbukkit.CraftEffect;
@@ -1673,6 +1673,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1677,6 +1677,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
packet.components = components;
getHandle().playerConnection.sendPacket(packet);
}

6
Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
View File

@ -1,4 +1,4 @@
From 3746d7c662973bd3e53de8da8b75eb5f7e205efd Mon Sep 17 00:00:00 2001
From 355aa45c1307053a37e07c9024e2953df1fe01b4 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
@ -70,10 +70,10 @@ index 759964b0f..26d4bd690 100644
if (d3 < 0.0D || d4 < d3 * d3) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 916781403..9e8ca0fbd 100644
index cd99801ff..a0c86d0e0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1536,6 +1536,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1540,6 +1540,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
return getHandle().locale;

6
Spigot-Server-Patches/0023-Only-refresh-abilities-if-needed.patch
View File

@ -1,14 +1,14 @@
From 329aa01be95b29541954ff13d27cf6416159be8b Mon Sep 17 00:00:00 2001
From ab130b09cf07883b904852ed5d8cc5b791e13772 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 23:12:03 -0600
Subject: [PATCH] Only refresh abilities if needed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9e8ca0fbd..44d0db180 100644
index a0c86d0e0..e3ad45aa8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1236,12 +1236,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1240,12 +1240,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setFlying(boolean value) {

6
Spigot-Server-Patches/0038-Add-player-view-distance-API.patch
View File

@ -1,4 +1,4 @@
From bc0c7f66ac5a805ce36fbeec388e30315c77e22e Mon Sep 17 00:00:00 2001
From 0ecf170f67207941568d9e933f1648f12a858ec4 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 14:35:27 -0600
Subject: [PATCH] Add player view distance API
@ -203,10 +203,10 @@ index e4ed2e991..9627a9be0 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 44d0db180..b2b707305 100644
index e3ad45aa8..e6ff3fc97 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1549,6 +1549,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1553,6 +1553,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().affectsSpawning;
}

6
Spigot-Server-Patches/0062-Configurable-inter-world-teleportation-safety.patch
View File

@ -1,4 +1,4 @@
From a1057f8d4cd02724b07e348e56022b1892e0cb40 Mon Sep 17 00:00:00 2001
From 3b584419d099289f1f5092871bddccad0cfe8d36 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Thu, 3 Mar 2016 02:50:31 -0600
Subject: [PATCH] Configurable inter-world teleportation safety
@ -43,10 +43,10 @@ index 536534d2e..bf7aaebd6 100644
entityplayer.getBukkitEntity().setVelocity(velocity);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c14100ac6..6a43f5674 100644
index 9b9e02ae1..18a481f2f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -614,7 +614,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -618,7 +618,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (fromWorld == toWorld) {
entity.playerConnection.teleport(to);
} else {

8
Spigot-Server-Patches/0067-Complete-resource-pack-API.patch
View File

@ -1,11 +1,11 @@
From ddec55539acaec545c955faeb164804d81f528d6 Mon Sep 17 00:00:00 2001
From 6d5516f22451507fd10a9d2c8d2717f9f6a560f0 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 48379f414..e1b85ebae 100644
index 060301da6..d23fe82db 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1067,7 +1067,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -23,7 +23,7 @@ index 48379f414..e1b85ebae 100644
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6a43f5674..45b11d87c 100644
index 18a481f2f..ff4512060 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -88,6 +88,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -37,7 +37,7 @@ index 6a43f5674..45b11d87c 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1640,6 +1644,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1644,6 +1648,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}

6
Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
View File

@ -1,4 +1,4 @@
From 558a45afb1073046cc7943652e9a7b4190d0fec7 Mon Sep 17 00:00:00 2001
From ef17ef72c8d9428c33f84c84fc3178dc9974f670 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data
@ -44,10 +44,10 @@ index 7e2cc66d7..a92b89d7c 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 45b11d87c..aa7751059 100644
index ff4512060..e1d34d46d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1460,6 +1460,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1464,6 +1464,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void setRealHealth(double health) {

6
Spigot-Server-Patches/0110-Workaround-for-setting-passengers-on-players.patch
View File

@ -1,4 +1,4 @@
From 5f6964d74c8c3c114cb90acbc09febeaa45dad66 Mon Sep 17 00:00:00 2001
From 4eddf67039422c5c5b56b11ec90359c231ad5e31 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 10 Apr 2016 03:23:32 -0500
Subject: [PATCH] Workaround for setting passengers on players
@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
SPIGOT-1915 & GH-114
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index aa7751059..0eee46edd 100644
index e1d34d46d..6e2773cbb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -624,6 +624,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -628,6 +628,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return true;
}

8
Spigot-Server-Patches/0119-Implement-PlayerLocaleChangeEvent.patch
View File

@ -1,4 +1,4 @@
From 4dafbc193f7f87f87eff67ac6b4cec08ea43227b Mon Sep 17 00:00:00 2001
From bbc97e4f39fba21a155703397d8ddbce77535318 Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
@ -45,10 +45,10 @@ index ed3546ccc..4b6976b19 100644
this.cm = packetplayinsettings.d();
this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0eee46edd..98e9da59a 100644
index 6e2773cbb..532b211c4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1633,8 +1633,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1637,8 +1637,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
@ -61,7 +61,7 @@ index 0eee46edd..98e9da59a 100644
}
public void setAffectsSpawning(boolean affects) {
@@ -1771,7 +1773,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1775,7 +1777,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale()
{

14
Spigot-Server-Patches/0185-IllegalPacketEvent.patch
View File

@ -1,4 +1,4 @@
From 11fb409ed96f90b7f93a5787b364cefb98e34c74 Mon Sep 17 00:00:00 2001
From 95eb029855720de4240a9a73831f7c7ded796d98 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 23 Jun 2016 23:33:57 -0400
Subject: [PATCH] IllegalPacketEvent
@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
Fired for invalid data from players that represents hacking attempts
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 8981e94df..40ab98f07 100644
index 09f1ef560..cca1c6aa3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -17,7 +17,7 @@ index 8981e94df..40ab98f07 100644
import co.aikar.timings.MinecraftTimings; // Paper
// CraftBukkit end
@@ -2288,8 +2289,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2287,8 +2288,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
}
} catch (Exception exception) {
@ -27,7 +27,7 @@ index 8981e94df..40ab98f07 100644
}
} else {
String s1;
@@ -2338,8 +2338,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2337,8 +2337,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit
}
} catch (Exception exception1) {
@ -37,7 +37,7 @@ index 8981e94df..40ab98f07 100644
}
} else if ("MC|TrSel".equals(s)) {
try {
@@ -2350,8 +2349,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2349,8 +2348,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
((ContainerMerchant) container).d(j);
}
} catch (Exception exception2) {
@ -47,7 +47,7 @@ index 8981e94df..40ab98f07 100644
}
} else {
TileEntity tileentity;
@@ -2492,8 +2490,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2491,8 +2489,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
iinventory.update();
}
} catch (Exception exception5) {
@ -57,7 +57,7 @@ index 8981e94df..40ab98f07 100644
}
}
} else if ("MC|ItemName".equals(s)) {
@@ -2592,8 +2589,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2591,8 +2588,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, k, this.player.inventory.getItem(k)));
this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
} catch (Exception exception7) {

6
Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch
View File

@ -1,4 +1,4 @@
From 7bbc777eb1dd1defd7e779522f05e9095753276e Mon Sep 17 00:00:00 2001
From bc04820d56bdc51cd13c3a880d50dbac3850c65f Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Tue, 27 Dec 2016 01:57:57 +0000
Subject: [PATCH] Properly fix item duplication bug
@ -19,10 +19,10 @@ index f8e289475..cce3f98da 100644
@Override
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 40ab98f07..4f8865d61 100644
index cca1c6aa3..3f9e60171 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2632,6 +2632,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2631,6 +2631,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start - Add "isDisconnected" method
public final boolean isDisconnected() {

6
Spigot-Server-Patches/0221-Fix-Anvil-Level-sync-to-client.patch
View File

@ -1,4 +1,4 @@
From 332880867e04c608e1bf1d4c4a4acd64b2e6daca Mon Sep 17 00:00:00 2001
From 217bbba50cbb6ecff5d10e4c02d4e0736121c4ed Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 11 Jul 2017 23:17:57 -0400
Subject: [PATCH] Fix Anvil Level sync to client
@ -26,10 +26,10 @@ index 175753c5a..16ec67569 100644
this.lastLevelCost = this.levelCost;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a9186b77a..1269a02aa 100644
index 7ee17b254..f83b16bcd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1328,6 +1328,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1332,6 +1332,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (container.getBukkitView().getType() != prop.getType()) {
return false;
}

6
Spigot-Server-Patches/0257-Ability-to-apply-mending-to-XP-API.patch
View File

@ -1,4 +1,4 @@
From 5e3717f8fbdc425eb88570efa92fe4c2df8187bc Mon Sep 17 00:00:00 2001
From 5a07c0ee8d6b1ae0143448473c2e081ec6517412 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Dec 2017 17:36:49 -0500
Subject: [PATCH] Ability to apply mending to XP API
@ -78,10 +78,10 @@ index d666088f2..f6b802dc8 100644
return this.damage;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 428b208ae..21631c588 100644
index d69784386..77c50ba14 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -923,8 +923,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -927,8 +927,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId());
}

10
Spigot-Server-Patches/0279-Player.setPlayerProfile-API.patch
View File

@ -1,4 +1,4 @@
From fedca7db912caed91d4ddd73f7a4e994cb1b12b1 Mon Sep 17 00:00:00 2001
From f66fc891df81485d65a13598e72d1fc97298470c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 12:29:48 -0400
Subject: [PATCH] Player.setPlayerProfile API
@ -48,7 +48,7 @@ index 2842956bf..8aeded425 100644
uniqueId = i.getId();
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 21631c588..1e73a3308 100644
index 77c50ba14..598b210ce 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,6 +1,8 @@
@ -60,7 +60,7 @@ index 21631c588..1e73a3308 100644
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.BaseEncoding;
@@ -1092,8 +1094,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1096,8 +1098,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
hiddenPlayers.put(player.getUniqueId(), hidingPlugins);
// Remove this player from the hidden player's EntityTrackerEntry
@ -76,7 +76,7 @@ index 21631c588..1e73a3308 100644
EntityTrackerEntry entry = tracker.trackedEntities.get(other.getId());
if (entry != null) {
entry.clear(getHandle());
@@ -1134,8 +1142,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1138,8 +1146,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
hiddenPlayers.remove(player.getUniqueId());
@ -91,7 +91,7 @@ index 21631c588..1e73a3308 100644
getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
@@ -1144,6 +1157,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1148,6 +1161,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
entry.updatePlayer(getHandle());
}
}

6
Spigot-Server-Patches/0286-Flag-to-disable-the-channel-limit.patch
View File

@ -1,4 +1,4 @@
From 826c03435f0d281d8f6850e7db2ab9b2a225f10c Mon Sep 17 00:00:00 2001
From 8f87642299aca3ce9cdb278c2a249ef44c78299a Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 31 Mar 2018 17:04:26 +0100
Subject: [PATCH] Flag to disable the channel limit
@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
provide an optional flag to disable this check, at your own risk.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1e73a3308..fd47065c6 100644
index 598b210ce..c0f4cec4d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -93,6 +93,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -20,7 +20,7 @@ index 1e73a3308..fd47065c6 100644
// Paper end
public CraftPlayer(CraftServer server, EntityPlayer entity) {
@@ -1337,7 +1338,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1341,7 +1342,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void addChannel(String channel) {

10
Spigot-Server-Patches/0325-InventoryCloseEvent-Reason-API.patch
View File

@ -1,4 +1,4 @@
From 524a2e194ee6786f5eb97bbe758c03816a2abe3f Mon Sep 17 00:00:00 2001
From c5d1182aa2daec8a3627d2295b105756845013b7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 3 Jul 2018 21:56:23 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@ -110,7 +110,7 @@ index cce3f98da..4ff505cfa 100644
this.r();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4f82d8aae..3f1454ec6 100644
index 36833b961..a54203c56 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1759,7 +1759,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -155,10 +155,10 @@ index d85b5defc..05ca403e8 100644
public boolean isBlocking() {
return getHandle().isBlocking();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index fd47065c6..53f973615 100644
index c0f4cec4d..6cbf429ff 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -640,7 +640,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -644,7 +644,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Close any foreign inventory
if (getHandle().activeContainer != getHandle().defaultContainer) {
@ -193,5 +193,5 @@ index 248873fb4..cce4acc0b 100644
human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
}
--
2.17.1
2.18.0

2
work/Bukkit

@ -1 +1 @@
Subproject commit 59b49b81dd4dd7c29debd3bb46961001531ea5ca
Subproject commit bdd0eda71f87cb8ca3b1842bd9bbd43bba5a08bd

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit fbe3046435815a1423bf4a287ad9ec914c91bb55
Subproject commit 57ab4cfc6f4ff526d44319d9b8c79f6848db2de7