75 lines
4.2 KiB
Diff
75 lines
4.2 KiB
Diff
From a61403a4a63d3cb2f3c78afd0089fe457ddeb029 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <git@md-5.net>
|
|
Date: Mon, 28 Jul 2014 16:55:51 +1000
|
|
Subject: [PATCH] Allow Attribute Capping.
|
|
|
|
Apply some sensible defaults and allow server owners to customize the maximum values of selected common attributes.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/AttributeRanged.java b/src/main/java/net/minecraft/server/AttributeRanged.java
|
|
index 13602f0..838daed 100644
|
|
--- a/src/main/java/net/minecraft/server/AttributeRanged.java
|
|
+++ b/src/main/java/net/minecraft/server/AttributeRanged.java
|
|
@@ -3,7 +3,7 @@ package net.minecraft.server;
|
|
public class AttributeRanged extends AttributeBase {
|
|
|
|
private final double a;
|
|
- private final double b;
|
|
+ public double b; // Spigot
|
|
private String c;
|
|
|
|
public AttributeRanged(IAttribute iattribute, String s, double d0, double d1, double d2) {
|
|
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
|
|
index 59b06c4..0cc3e2f 100644
|
|
--- a/src/main/java/net/minecraft/server/GenericAttributes.java
|
|
+++ b/src/main/java/net/minecraft/server/GenericAttributes.java
|
|
@@ -9,11 +9,13 @@ import org.apache.logging.log4j.Logger;
|
|
public class GenericAttributes {
|
|
|
|
private static final Logger f = LogManager.getLogger();
|
|
- public static final IAttribute maxHealth = (new AttributeRanged((IAttribute) null, "generic.maxHealth", 20.0D, 0.0D, Double.MAX_VALUE)).a("Max Health").a(true);
|
|
+ // Spigot start
|
|
+ public static final IAttribute maxHealth = (new AttributeRanged((IAttribute) null, "generic.maxHealth", 20.0D, 0.1D, org.spigotmc.SpigotConfig.maxHealth)).a("Max Health").a(true);
|
|
public static final IAttribute FOLLOW_RANGE = (new AttributeRanged((IAttribute) null, "generic.followRange", 32.0D, 0.0D, 2048.0D)).a("Follow Range");
|
|
public static final IAttribute c = (new AttributeRanged((IAttribute) null, "generic.knockbackResistance", 0.0D, 0.0D, 1.0D)).a("Knockback Resistance");
|
|
- public static final IAttribute MOVEMENT_SPEED = (new AttributeRanged((IAttribute) null, "generic.movementSpeed", 0.699999988079071D, 0.0D, Double.MAX_VALUE)).a("Movement Speed").a(true);
|
|
- public static final IAttribute ATTACK_DAMAGE = new AttributeRanged((IAttribute) null, "generic.attackDamage", 2.0D, 0.0D, Double.MAX_VALUE);
|
|
+ public static final IAttribute MOVEMENT_SPEED = (new AttributeRanged((IAttribute) null, "generic.movementSpeed", 0.699999988079071D, 0.0D, org.spigotmc.SpigotConfig.movementSpeed)).a("Movement Speed").a(true);
|
|
+ public static final IAttribute ATTACK_DAMAGE = new AttributeRanged((IAttribute) null, "generic.attackDamage", 2.0D, 0.0D, org.spigotmc.SpigotConfig.attackDamage);
|
|
+ // Spigot end
|
|
|
|
public static NBTTagList a(AttributeMapBase attributemapbase) {
|
|
NBTTagList nbttaglist = new NBTTagList();
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index 2a23a4e..a187598 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -14,6 +14,8 @@ import java.util.Map;
|
|
import java.util.Set;
|
|
import java.util.logging.Level;
|
|
import gnu.trove.map.hash.TObjectIntHashMap;
|
|
+import net.minecraft.server.AttributeRanged;
|
|
+import net.minecraft.server.GenericAttributes;
|
|
import net.minecraft.server.MinecraftServer;
|
|
import org.bukkit.Bukkit;
|
|
import org.bukkit.ChatColor;
|
|
@@ -346,4 +348,17 @@ public class SpigotConfig
|
|
{
|
|
movedTooQuicklyThreshold = getDouble( "settings.moved-too-quickly-threshold", 100.0D );
|
|
}
|
|
+
|
|
+ public static double maxHealth = 2048;
|
|
+ public static double movementSpeed = 2048;
|
|
+ public static double attackDamage = 2048;
|
|
+ private static void attributeMaxes()
|
|
+ {
|
|
+ maxHealth = getDouble( "settings.attribute.maxHealth.max", maxHealth );
|
|
+ ( (AttributeRanged) GenericAttributes.maxHealth ).b = maxHealth;
|
|
+ movementSpeed = getDouble( "settings.attribute.movementSpeed.max", movementSpeed );
|
|
+ ( (AttributeRanged) GenericAttributes.MOVEMENT_SPEED ).b = movementSpeed;
|
|
+ attackDamage = getDouble( "settings.attribute.attackDamage.max", attackDamage );
|
|
+ ( (AttributeRanged) GenericAttributes.ATTACK_DAMAGE ).b = attackDamage;
|
|
+ }
|
|
}
|
|
--
|
|
1.9.0.msysgit.0
|
|
|