mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
59439785d9
Upstream has released updates that appear to apply and compile correctly Paper Changes: cc0494817 Tick inactive goal selectors c19ec6394 fix 4878 by always calling events using bukkit singleton 5d216be1d Fix MC-181190 curing zombie villager discount exploit (#4871)
36 lines
1.8 KiB
Diff
36 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <blake.galbreath@gmail.com>
|
|
Date: Tue, 24 Nov 2020 05:32:02 -0600
|
|
Subject: [PATCH] Add configurable snowball damage
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntitySnowball.java b/src/main/java/net/minecraft/server/EntitySnowball.java
|
|
index 34a5f481e6..d7bab4446a 100644
|
|
--- a/src/main/java/net/minecraft/server/EntitySnowball.java
|
|
+++ b/src/main/java/net/minecraft/server/EntitySnowball.java
|
|
@@ -29,7 +29,7 @@ public class EntitySnowball extends EntityProjectileThrowable {
|
|
protected void a(MovingObjectPositionEntity movingobjectpositionentity) {
|
|
super.a(movingobjectpositionentity);
|
|
Entity entity = movingobjectpositionentity.getEntity();
|
|
- int i = entity instanceof EntityBlaze ? 3 : 0;
|
|
+ int i = entity.world.purpurConfig.snowballDamage >= 0 ? entity.world.purpurConfig.snowballDamage : entity instanceof EntityBlaze ? 3 : 0; // Purpur
|
|
|
|
entity.damageEntity(DamageSource.projectile(this, this.getShooter()), (float) i);
|
|
}
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index 8f0be34937..8d4fc335b8 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -196,6 +196,11 @@ public class PurpurWorldConfig {
|
|
witherSkullDespawnRate = getInt("gameplay-mechanics.projectile-despawn-rates.wither_skull", witherSkullDespawnRate);
|
|
}
|
|
|
|
+ public int snowballDamage = -1;
|
|
+ private void snowballSettings() {
|
|
+ snowballDamage = getInt("gameplay-mechanics.projectile-damage.snowball", snowballDamage);
|
|
+ }
|
|
+
|
|
public boolean useBetterMending = false;
|
|
public boolean boatEjectPlayersOnLand = false;
|
|
public boolean disableDropsOnCrammingDeath = false;
|