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

Updated Upstream (Paper Changes)

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

Paper Changes:
7480b94720 fix empty array elements in command args (#5778)
a67959e131 Add bee stinger API (#5962)
e4ecf6ce87 [ci skip] Fix various compile warnings (#6264)
7a5025d461 Fix closeInventory shenanigans (#6292)
This commit is contained in:
William Blake Galbreath
2021-07-30 06:35:12 -05:00
parent 0274bd5421
commit 9adda450f5
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0014-LivingEntity-safeFallDistance.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ebb891dd292f4f1496bf740947b2061a1490073f..ef9cb7eba59e4a1f730cc608d7aece77de8b0e4d 100644
index cecffa5879f386e99ccd27386f90074aef0b72fe..c59882224b44d1d477ca8d84155b7f3b9f7da0ce 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity {
@@ -62,10 +62,10 @@ index c67f33f2e2e0ff5c2a85782185103325a6bf4535..a8ffdc8810152d77668aad7bad15a00c
// Purpur start
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 53b61b609361c305fb8d1f1a8700e81ce139fde4..3e4ad876fa34d0e509fe6331767d31068c4ddb20 100644
index 646ea844ed2cf674569937653f9920e4fdbf62a0..81b26444a7be0b20e83f32ec2ba3648e4997af45 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -872,4 +872,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -893,4 +893,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
}
// Paper end

4
patches/server/0101-LivingEntity-broadcastItemBreak.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 00c56b7c2d2d34029144ef953aedd085183a5928..e0acfc315f80d9a5c5aa045845ccc3e00c4435c5 100644
index 81b26444a7be0b20e83f32ec2ba3648e4997af45..6234d72de5b6c4c3dd3f65cc53c99c63ab2f251d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -883,5 +883,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -904,5 +904,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setSafeFallDistance(float safeFallDistance) {
getHandle().safeFallDistance = safeFallDistance;
}

4
patches/server/0205-API-for-any-mob-to-burn-daylight.patch
View File

@@ -348,10 +348,10 @@ index 2fb5c5ea01d5f1071c8e8a39e7863ed0640d3fc9..e1513023d7f9701f2c1fde816fa81767
// Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 624f06c50c1e8c938ddc7b4b0ee63d723b0be89b..78154669fa940888de5cf60b7067f9fb34c3a98e 100644
index 6234d72de5b6c4c3dd3f65cc53c99c63ab2f251d..6c258c7eadce0f0c2a4af5bef9527bf5b7d53c40 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -889,5 +889,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -910,5 +910,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}