Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f75636b [ci skip] Update my name in author field (#6625)
PaperMC/Paper@d2c2b7a Implement Translatable on villager Profession (#6542)
PaperMC/Paper@9087993 Mark fish and axolotls from buckets as persistent (#6392)
PaperMC/Paper@aad7d37 Fix axolotl/fish persistence
PaperMC/Paper@6084ac3 Fix upstream nullability on entity equipment getters (#6519)
PaperMC/Paper@655cd8f Fix upstreams fix for composters and variable hoppers (#6563)
PaperMC/Paper@7ac51f9 Include slot when constructing the bukkit Attribute Modifiers (#6537)
PaperMC/Paper@caa4780 Add more component name methods (#6578)
PaperMC/Paper@9460497 Apply furnace cook speed multiplier through event (#6378)
PaperMC/Paper@f4f5a76 Fix anvil inventory events (#6157)
PaperMC/Paper@1707c10 fixes cancelling PlayerTradeEvent (#5612)
This commit is contained in:
granny
2021-09-23 13:10:23 -07:00
parent 3b75acda59
commit acb8a26d9a
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0156-Add-unsafe-Entity-serialization-API.patch
View File

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 9430d4e270cd5ebabeffde0e28f0a96657ce0262..c50089b21d3b258ae4b3f0a6b2625fb129764fee 100644
index 5a12ca0a556da2d67f58dcb2466eafe5237671db..b290df0ac4951abeade7b6b038fe5f963060d425 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1265,5 +1265,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1276,5 +1276,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public boolean isRidableInWater() {
return getHandle().rideableUnderWater();
}
@@ -34,7 +34,7 @@ index 9430d4e270cd5ebabeffde0e28f0a96657ce0262..c50089b21d3b258ae4b3f0a6b2625fb1
// Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 72cfffd80ad76abe7cb16bc9133730338c07b6f6..09b99e3465ae142081f01c483116c1d1adb34842 100644
index 408863b137b7bda3f3e654ac3665ddeefb6d9e7b..1a3170810dacc3017dc16c2dd2ceca3d40023b2a 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -407,9 +407,14 @@ public final class CraftMagicNumbers implements UnsafeValues {