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

[Auto] Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
95ff95ed #588: Add Player#sendBlockDamage()

CraftBukkit Changes:
ea050e6e9 #807: Add Player#sendBlockDamage()
This commit is contained in:
Aikar
2021-02-24 04:32:17 -05:00
parent 6ae2121257
commit ca4c781d83
47 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0059-Complete-resource-pack-API.patch
View File

@@ -22,10 +22,10 @@ index 0dec3e50fcaf4505dcd7800c8ec985ae302c1da2..c1d0aa8248af19124b1c94313602cd4d
// 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 b2e153306ffc1ee0456bb37fb164b5a1eb68f117..0c5d3360cbd38b0ac32e115b2b889e6d24dc4164 100644
index 465fd7b4ee8f0a36c2a944c95666979a2d33c248..21952a8fa3eebad70dba5ab8fb900209a81bdb20 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -137,6 +137,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -138,6 +138,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private double health = 20;
private boolean scaledHealth = false;
private double healthScale = 20;
@@ -36,7 +36,7 @@ index b2e153306ffc1ee0456bb37fb164b5a1eb68f117..0c5d3360cbd38b0ac32e115b2b889e6d
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1888,6 +1892,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1901,6 +1905,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean getAffectsSpawning() {
return this.getHandle().affectsSpawning;
}