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

Updated Upstream (Bukkit/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

Bukkit Changes:
58d299a5 Clarify that TotalExperience (XpTotal) is not displayed anywhere
3342ab1e #460: Add Player#sendExperienceChange
acc05b40 SPIGOT-5525: saveResource saves files from server jars

CraftBukkit Changes:
5c6b0dc6 SPIGOT-5526: Call EntityChangeBlockEvent for bees triggering crop growth
b91ce119 #601: Implement Player#sendExperienceChange
661bebc6 Remove outdated build delay.
This commit is contained in:
Shane Freeder
2020-01-21 15:12:47 +00:00
parent 9c2d9a5f41
commit d4ae43fc00
33 changed files with 205 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 3121febf6563ddfdff9b7b41316242ae3e7f0ca6 Mon Sep 17 00:00:00 2001
From 0ec882ebb0a37aab44304a8121daee30f7ad733a 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 fae57fc2cf..d90c6a732a 100644
index fae57fc2c..d90c6a732 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1334,7 +1334,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -22,10 +22,10 @@ index fae57fc2cf..d90c6a732a 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 a80c0164a3..6ff6d646a5 100644
index 658854dc9..2cdea9f5d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -133,6 +133,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -134,6 +134,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 a80c0164a3..6ff6d646a5 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1744,6 +1748,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1765,6 +1769,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean getAffectsSpawning() {
return this.getHandle().affectsSpawning;
}
@@ -70,5 +70,5 @@ index a80c0164a3..6ff6d646a5 100644
@Override
--
2.24.1
2.25.0