From ae2e652a47a0d3b6a3306b4019e734aebadea7c1 Mon Sep 17 00:00:00 2001
From: Xamora64 <49618907+Xamora64@users.noreply.github.com>
Date: Tue, 1 Apr 2025 14:17:47 +0200
Subject: [PATCH] Can't die when handcuffed; don't be criminal if kill a evil
 man; remove debug message

---
 build.gradle                                              | 2 +-
 .../java/xamora/gp_dbc/render/RenderHandcuffIcon.java     | 2 +-
 src/main/java/xamora/gp_dbc/system/Criminal.java          | 4 ++--
 src/main/java/xamora/gp_dbc/system/Criminals.java         | 8 +++++++-
 src/main/java/xamora/gp_dbc/system/JailEvent.java         | 6 +++---
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index dd8164c..1ac47ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ apply plugin: 'forge'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-version = "1.0.2"
+version = "1.1.2"
 group = "xamora.gp_dbc" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "gp_dbc"
 
diff --git a/src/main/java/xamora/gp_dbc/render/RenderHandcuffIcon.java b/src/main/java/xamora/gp_dbc/render/RenderHandcuffIcon.java
index afd3504..b9baa87 100644
--- a/src/main/java/xamora/gp_dbc/render/RenderHandcuffIcon.java
+++ b/src/main/java/xamora/gp_dbc/render/RenderHandcuffIcon.java
@@ -62,7 +62,7 @@ public class RenderHandcuffIcon extends Gui {
                     && playerAroundHandcuffed.containsKey(player.getUniqueID())) {
 
                 double distance = Math.sqrt(Math.pow(player.posX - mc_ply.posX, 2) + Math.pow(player.posY - mc_ply.posY, 2));
-                System.out.println("distance: " + distance);
+                //System.out.println("distance: " + distance);
                 if (distance > 10)
                     continue;
 
diff --git a/src/main/java/xamora/gp_dbc/system/Criminal.java b/src/main/java/xamora/gp_dbc/system/Criminal.java
index 2974e5e..be31254 100644
--- a/src/main/java/xamora/gp_dbc/system/Criminal.java
+++ b/src/main/java/xamora/gp_dbc/system/Criminal.java
@@ -1,5 +1,6 @@
 package xamora.gp_dbc.system;
 
+import JinRyuu.JRMCore.JRMCoreH;
 import JinRyuu.JRMCore.server.JGPlayerMP;
 import com.forgeessentials.chat.ModuleChat;
 import xamora.gp_dbc.Main;
@@ -42,8 +43,7 @@ public class Criminal {
 
     public void addKill(EntityPlayer killed) {
         JGPlayerMP jgKilled = new JGPlayerMP(killed);
-        NBTTagCompound nbt = jgKilled.connectBaseNBT();
-        long add = Math.max(jgKilled.getAlignment() - 33, 0);
+        long add = Math.max(jgKilled.getAlignment() - 32, 0);
         if (Main.gp.isInGalacticPatrol(killed))
             add *= 2;
         rate += add;
diff --git a/src/main/java/xamora/gp_dbc/system/Criminals.java b/src/main/java/xamora/gp_dbc/system/Criminals.java
index fe47364..a0c2f1a 100644
--- a/src/main/java/xamora/gp_dbc/system/Criminals.java
+++ b/src/main/java/xamora/gp_dbc/system/Criminals.java
@@ -1,5 +1,6 @@
 package xamora.gp_dbc.system;
 
+import JinRyuu.JRMCore.server.JGPlayerMP;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -52,7 +53,12 @@ public class Criminals {
                 return;
         }
 
-        Criminal criminal = null;
+        JGPlayerMP jgKilled = new JGPlayerMP(dead);
+        jgKilled.connectBaseNBT();
+        if (jgKilled.getAlignment() < 33)
+            return;
+
+        Criminal criminal;
         if (isCriminal(killer.getUniqueID()))
             criminal = getCriminal(killer.getUniqueID());
         else
diff --git a/src/main/java/xamora/gp_dbc/system/JailEvent.java b/src/main/java/xamora/gp_dbc/system/JailEvent.java
index fa45d2e..c5704bb 100644
--- a/src/main/java/xamora/gp_dbc/system/JailEvent.java
+++ b/src/main/java/xamora/gp_dbc/system/JailEvent.java
@@ -24,7 +24,7 @@ import static xamora.gp_dbc.Main.gp;
 public class JailEvent {
 
     int tick_time = 0;
-    final int SLOWTICK_MAX = 20;//2000;
+    final int SLOWTICK_MAX = 100;
 
     @SideOnly(Side.SERVER)
     @SubscribeEvent
@@ -108,12 +108,12 @@ public class JailEvent {
 
     @SideOnly(Side.SERVER)
     @SubscribeEvent
-    public void checkDeathCancel(LivingHurtEvent event) {
+    public void checkHurtCancel(LivingHurtEvent event) {
         if (!(event.entity instanceof EntityPlayer))
             return;
 
         EntityPlayer player = (EntityPlayer)event.entity;
-        if (gp.jail.isInJail(player))
+        if (gp.jail.isInJail(player) || Handcuff.isHandcuffed(player))
             event.setCanceled(true);
     }
 }