Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-09-27 22:18:11 +02:00
Code Issues Projects Releases Wiki Activity

Add option to disable combat cooldown

Browse Source
This commit is contained in:
= 2018-11-27 20:00:38 -08:00
parent 20e3e70461
commit 98afe494c1
No known key found for this signature in database
GPG Key ID: 918580825B8F6862
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
war/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/target/

1
war/src/main/java/com/tommytony/war/War.java
View File

@ -147,6 +147,7 @@ public class War extends JavaPlugin {
warConfig.put(WarConfig.LANGUAGE, Locale.getDefault().toString()); warConfig.put(WarConfig.LANGUAGE, Locale.getDefault().toString());
warConfig.put(WarConfig.AUTOJOIN, ""); warConfig.put(WarConfig.AUTOJOIN, "");
warConfig.put(WarConfig.TPWARMUP, 0); warConfig.put(WarConfig.TPWARMUP, 0);
warConfig.put(WarConfig.DISABLECOOLDOWN, false);
warzoneDefaultConfig.put(WarzoneConfig.AUTOASSIGN, false); warzoneDefaultConfig.put(WarzoneConfig.AUTOASSIGN, false);
warzoneDefaultConfig.put(WarzoneConfig.BLOCKHEADS, true); warzoneDefaultConfig.put(WarzoneConfig.BLOCKHEADS, true);

3
war/src/main/java/com/tommytony/war/config/WarConfig.java
View File

@ -13,7 +13,8 @@ public enum WarConfig {
MAXSIZE (Integer.class, "Max size", "Maximum volume of a warzone"), MAXSIZE (Integer.class, "Max size", "Maximum volume of a warzone"),
LANGUAGE (String.class, "Language", "Preferred server language"), LANGUAGE (String.class, "Language", "Preferred server language"),
AUTOJOIN (String.class, "Auto-join", "Name of warzone to send players to upon join"), AUTOJOIN (String.class, "Auto-join", "Name of warzone to send players to upon join"),
TPWARMUP(Integer.class, "TP warmup", "Amount of seconds a player must wait after requesting a teleport"); TPWARMUP(Integer.class, "TP warmup", "Amount of seconds a player must wait after requesting a teleport"),
DISABLECOOLDOWN(Boolean.class, "Disable the 1.9 combat cooldown", "Disables the attack cooldown when swinging a weapon");
private final Class<?> configType; private final Class<?> configType;
private final String title; private final String title;

3
war/src/main/java/com/tommytony/war/event/WarPlayerListener.java
View File

@ -19,6 +19,7 @@ import com.tommytony.war.utility.LoadoutSelection;
import com.tommytony.war.volume.Volume; import com.tommytony.war.volume.Volume;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.attribute.Attribute;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
@ -47,6 +48,7 @@ import java.util.logging.Level;
public class WarPlayerListener implements Listener { public class WarPlayerListener implements Listener {
private java.util.Random random = new java.util.Random(); private java.util.Random random = new java.util.Random();
private HashMap<String, Location> latestLocations = new HashMap<String, Location>(); private HashMap<String, Location> latestLocations = new HashMap<String, Location>();
private boolean cooldownDisabled = War.war.getWarConfig().getBoolean(WarConfig.DISABLECOOLDOWN);
/** /**
* Correctly removes quitting players from warzones * Correctly removes quitting players from warzones
@ -70,6 +72,7 @@ public class WarPlayerListener implements Listener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerJoin(final PlayerJoinEvent event) { public void onPlayerJoin(final PlayerJoinEvent event) {
event.getPlayer().getAttribute(Attribute.GENERIC_ATTACK_SPEED).setBaseValue(cooldownDisabled ? 1024 : 4);
String autojoinName = War.war.getWarConfig().getString(WarConfig.AUTOJOIN); String autojoinName = War.war.getWarConfig().getString(WarConfig.AUTOJOIN);
boolean autojoinEnabled = !autojoinName.isEmpty(); boolean autojoinEnabled = !autojoinName.isEmpty();
if (autojoinEnabled) { // Won't be able to find warzone if unset if (autojoinEnabled) { // Won't be able to find warzone if unset