diff --git a/src/main/java/xamora/gp_dbc/config/ConfigManager.java b/src/main/java/xamora/gp_dbc/config/ConfigManager.java index d58fb64..3b351ff 100644 --- a/src/main/java/xamora/gp_dbc/config/ConfigManager.java +++ b/src/main/java/xamora/gp_dbc/config/ConfigManager.java @@ -44,7 +44,7 @@ public class ConfigManager { static public double MULT_JAIL_TIME = 17.28; // 17.28 * 10 000 = 48 hours static public int REDUCE_ALIGN_KILL = 33; - // 7.2 * 24000 = 172 800 = 48h + // 17.28 * 10 000 = 48 hours static public int MAX_RATE_CRIMINAL = 10000; static public long RATE_CRIMINAL_NOT_SAFE = 5000; // Not use static public int RATE_TO_HAVE_POSITION = 1000; diff --git a/src/main/java/xamora/gp_dbc/gui/GuiHandcuffed.java b/src/main/java/xamora/gp_dbc/gui/GuiHandcuffed.java index 8bdb71a..d65fb13 100644 --- a/src/main/java/xamora/gp_dbc/gui/GuiHandcuffed.java +++ b/src/main/java/xamora/gp_dbc/gui/GuiHandcuffed.java @@ -3,6 +3,7 @@ package xamora.gp_dbc.gui; import JinRyuu.JRMCore.JRMCoreH; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import xamora.gp_dbc.Main; +import xamora.gp_dbc.config.ConfigManager; import xamora.gp_dbc.system.Handcuffed; import xamora.gp_dbc.utils.TextUtils; import net.minecraft.client.Minecraft; @@ -47,8 +48,8 @@ public class GuiHandcuffed extends Gui { if (event.isCancelable()) return; - //if (time_left < -timeToWait) - //return; + if (time_left < -Handcuffed.timeToWait) + handcuffed = false; if (JRMCoreH.ko <= 0) return; diff --git a/src/main/java/xamora/gp_dbc/system/Handcuffed.java b/src/main/java/xamora/gp_dbc/system/Handcuffed.java index 717e925..f67a829 100644 --- a/src/main/java/xamora/gp_dbc/system/Handcuffed.java +++ b/src/main/java/xamora/gp_dbc/system/Handcuffed.java @@ -14,6 +14,7 @@ public class Handcuffed { public UUID jailer; public static long timeToWait = ConfigManager.TIME_TO_GO_IN_JAIL; + public static long timeToUnhandcuff = ConfigManager.TIME_UNHANDCUFFING; public Handcuffed(UUID inmate, UUID jailer) { this(inmate, jailer, System.currentTimeMillis(), false);