SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ver/1.14

Browse Source
This commit is contained in:
Shane Freeder
2019-05-27 01:16:47 +01:00
parent db3bafc4d1 3e0027e482
commit 70e671043a
14 changed files with 15 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/PlayerDeathEvent-getItemsToKeep.patch
View File

@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 3ecf18379b..e9f158d8ec 100644
index c7f22870b6..21ec45e6ff 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {