Paper/Spigot-Server-Patches/0007-Configurable-damage-multiplier-for-PvP-blocking.patch

39 lines
1.8 KiB
Diff
Raw Normal View History

2015-03-08 02:16:09 +01:00
From 9b9c2851ddafd52f5e631de7ec1be02a35ad64e1 Mon Sep 17 00:00:00 2001
2015-01-29 22:25:50 +01:00
From: Zach Brown <zach.brown@destroystokyo.com>
2015-03-08 02:16:09 +01:00
Date: Sat, 7 Mar 2015 20:27:02 -0600
Subject: [PATCH] Configurable damage multiplier for PvP blocking
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
2015-03-08 02:16:09 +01:00
index d73395a..9dce3ac 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
2015-03-08 02:16:09 +01:00
@@ -861,7 +861,7 @@ public abstract class EntityHuman extends EntityLiving {
// CraftBukkit end
2014-11-28 02:17:45 +01:00
if (!this.isInvulnerable(damagesource)) {
if (!damagesource.ignoresArmor() && this.isBlocking() && f > 0.0F) {
- f = (1.0F + f) * 0.5F;
2015-03-08 02:16:09 +01:00
+ f = (1.0F + f) * this.world.paperSpigotConfig.playerBlockingDamageMultiplier; // PaperSpigot - Configurable damage multiplier for blocking;
}
2014-07-09 05:05:35 +02:00
f = this.applyArmorModifier(damagesource, f);
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
2015-03-08 02:16:09 +01:00
index f3bbac8..2a84879 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
2014-08-06 01:45:22 +02:00
@@ -90,4 +90,11 @@ public class PaperSpigotWorldConfig
squidMaxSpawnHeight = getDouble( "squid-spawn-height.maximum", 63.0D );
2015-03-08 02:16:09 +01:00
log( "Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight );
}
+
2014-08-06 01:45:22 +02:00
+ public float playerBlockingDamageMultiplier;
+ private void playerBlockingDamageMultiplier()
+ {
+ playerBlockingDamageMultiplier = getFloat( "player-blocking-damage-multiplier", 0.5F );
2015-03-08 02:16:09 +01:00
+ log( "Player blocking damage multiplier set to " + playerBlockingDamageMultiplier );
+ }
}
--
2015-03-08 02:16:09 +01:00
1.9.1