Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

[Auto] Updated Upstream (CraftBukkit)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
dc7c3c61f SPIGOT-5921: Improve setNoDamageTicks for Players
53849f57f SPIGOT-5922: Smithing recipes not registering
This commit is contained in:
Aikar
2020-07-01 21:27:09 -04:00
parent 0823d3fdce
commit a96d3e8984
40 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
View File

@@ -22,7 +22,7 @@ index 8ecca907357119ed8eb67381914daba4ae6db38f..ffed0587323dbf522e478f43948bbb03
// 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 a7526e8f5e2fe3b22133181659be791acbc05d57..109139673561175819821ff992d0d8846878b91a 100644
index c90d3c8fe0965f437fe17979978f1189a27851ac..34a3e269c59d1797c764a2dc6c5ba9e646792084 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -138,6 +138,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -36,7 +36,7 @@ index a7526e8f5e2fe3b22133181659be791acbc05d57..109139673561175819821ff992d0d884
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1788,6 +1792,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1794,6 +1798,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean getAffectsSpawning() {
return this.getHandle().affectsSpawning;
}