Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +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@cd110a8 [ci skip] Update CONTRIBUTING.md (#10318)
PaperMC/Paper@e603486 Add onboarding message for initial server start (#10312)
PaperMC/Paper@d361a7f Fix DamageSource API (#10307)
PaperMC/Paper@99a6416 Expand Hopper BlockState API (#10328)
This commit is contained in:
granny
2024-03-17 11:58:03 -07:00
parent df23ed3f55
commit 943f9af80b
19 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0249-Stonecutter-damage.patch
View File

@@ -18,7 +18,7 @@ index 5c9d49b40a940df724101bef339a9ac5a31fd025..8ed6b8ddc76bda3d4f298b3076dba927
// Purpur end
return damageSource.getLocalizedDeathMessage(this.mob);
diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
index f7786be77a0594fa5e11a328648cbad16bbab2e1..6736093629bf92a888b0c971f3cf0a4e725cddec 100644
index 5cbbff174b6f10bebe1923c10f84fc26e4d3000e..41651c877246f38c73cc9c81b37a0b86e5054cb9 100644
--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
@@ -28,6 +28,7 @@ public class DamageSource {
@@ -26,10 +26,10 @@ index f7786be77a0594fa5e11a328648cbad16bbab2e1..6736093629bf92a888b0c971f3cf0a4e
private boolean poison = false;
private boolean scissors = false; // Purpur
+ private boolean stonecutter = false; // Purpur
private Entity customCausingEntity = null; // This field is a helper for when causing entity damage is not set by vanilla
@Nullable
private Entity customEventDamager = null; // This field is a helper for when causing entity damage is not set by vanilla // Paper - fix DamageSource API
public DamageSource sweep() {
@@ -66,6 +67,15 @@ public class DamageSource {
@@ -67,6 +68,15 @@ public class DamageSource {
public boolean isScissors() {
return this.scissors;
}
@@ -44,8 +44,8 @@ index f7786be77a0594fa5e11a328648cbad16bbab2e1..6736093629bf92a888b0c971f3cf0a4e
+ }
// Purpur end
public Entity getCausingEntity() {
@@ -107,6 +117,7 @@ public class DamageSource {
// Paper start - fix DamageSource API
@@ -113,6 +123,7 @@ public class DamageSource {
damageSource.poison = this.isPoison();
damageSource.melting = this.isMelting();
damageSource.scissors = this.isScissors(); // Purpur
@@ -124,10 +124,10 @@ index 0dc05919dfbbf73230505fcdc25d949b1602801c..996bd26e95e766ce4ca7e61d060881fe
return BlockPathTypes.STICKY_HONEY;
} else if (blockState.is(Blocks.COCOA)) {
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index ac836274a2d725e3fac55394154ae2148024853a..94be4f367f4c6cb2386d0e59d0417f29fca1cec7 100644
index c12fb91e6fa286b99bd08ff39cda7d6e4ff73f19..f587c8defaf55ffa77d90deb8b9a3975e8f90ef9 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1134,7 +1134,7 @@ public class CraftEventFactory {
@@ -1132,7 +1132,7 @@ public class CraftEventFactory {
return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), entity, DamageCause.LAVA, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
} else if (source.getDirectBlock() != null) {
DamageCause cause;