geforkt von Mirrors/Paper
7b0c576798
Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
47 Zeilen
2.1 KiB
Diff
47 Zeilen
2.1 KiB
Diff
From f67c6952b8a3653548157d3bcfd6acace37d0c5b Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <Zbob750@live.com>
|
|
Date: Tue, 24 Jun 2014 07:39:37 -0500
|
|
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
|
|
index 01062ce..a75e854 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -20,6 +20,8 @@ import org.bukkit.event.player.PlayerDropItemEvent;
|
|
import org.bukkit.event.player.PlayerItemConsumeEvent;
|
|
// CraftBukkit end
|
|
|
|
+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot
|
|
+
|
|
public abstract class EntityHuman extends EntityLiving implements ICommandListener {
|
|
|
|
public PlayerInventory inventory = new PlayerInventory(this);
|
|
@@ -812,7 +814,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
|
|
// CraftBukkit end
|
|
if (!this.isInvulnerable()) {
|
|
if (!damagesource.ignoresArmor() && this.isBlocking() && f > 0.0F) {
|
|
- f = (1.0F + f) * 0.5F;
|
|
+ f = (1.0F + f) * PaperSpigotWorldConfig.playerBlockingDamageMultiplier; // PaperSpigot - Configurable PvP blocking damage multiplier
|
|
}
|
|
|
|
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
|
|
index dc8c581..9f2c3dc 100644
|
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
@@ -89,4 +89,10 @@ public class PaperSpigotWorldConfig
|
|
squidMinSpawnHeight = getDouble( "squid-spawn-height.minimum", 45.0D );
|
|
squidMaxSpawnHeight = getDouble( "squid-spawn-height.maximum", 63.0D );
|
|
}
|
|
+
|
|
+ public static float playerBlockingDamageMultiplier;
|
|
+ private void playerBlockingDamageMultiplier()
|
|
+ {
|
|
+ playerBlockingDamageMultiplier = getFloat( "player-blocking-damage-multiplier", 0.5F );
|
|
+ }
|
|
}
|
|
--
|
|
1.9.1
|
|
|