From cb88b55d737a2b2d0e85fdb9d93384be1cfe0f48 Mon Sep 17 00:00:00 2001 From: Alejandro <25-alejandro@users.noreply.git.krews.org> Date: Wed, 29 May 2019 21:37:43 +0300 Subject: [PATCH] Prevent too big z positions --- .../java/com/eu/habbo/habbohotel/items/ItemManager.java | 2 +- .../java/com/eu/habbo/habbohotel/users/HabboItem.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java b/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java index 16a86a43..26fc65ec 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java @@ -272,7 +272,7 @@ public class ItemManager { this.interactionsList.add(new ItemInteraction("wf_cnd_not_freeze", WiredConditionNotFreezeGameActive.class)); this.interactionsList.add(new ItemInteraction("wf_cnd_habbo_has_rank", WiredConditionHabboHasRank.class)); this.interactionsList.add(new ItemInteraction("wf_cnd_habbo_not_rank", WiredConditionHabboNotRank.class)); - this.interactionsList.add(new ItemInteraction("wf_cnd_habbo_has_diamonds", WiredConditionHabboHasDiamonds.class)); + this.interactionsList.add(new ItemInteraction("wf_cnd_habbo_has_diamonds", WiredConditionHabboHasDiamonds.class)); this.interactionsList.add(new ItemInteraction("wf_cnd_habbo_has_credits", WiredConditionHabboHasCredits.class)); this.interactionsList.add(new ItemInteraction("wf_cnd_habbo_has_duckets", WiredConditionHabboHasDuckets.class)); this.interactionsList.add(new ItemInteraction("wf_cnd_not_habbo_has_diamonds", WiredConditionNotHabboHasDiamonds.class)); diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java index 66cdaf73..d7a5c7ab 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java @@ -180,6 +180,7 @@ public abstract class HabboItem implements Runnable, IEventTriggers { } public void setZ(double z) { + if (z > 9999) return; this.z = z; } @@ -245,12 +246,7 @@ public abstract class HabboItem implements Runnable, IEventTriggers { statement.setString(3, this.wallPosition); statement.setInt(4, this.x); statement.setInt(5, this.y); - - String zString = String.valueOf(Math.round(this.z * Math.pow(10, 6)) / Math.pow(10, 6)); - if (zString.length() > 10) zString = zString.substring(0, 10); - if (zString.endsWith(".")) zString = zString.substring(0, zString.length() - 1); - - statement.setDouble(6, Double.valueOf(zString)); + statement.setDouble(6, Math.min(9999, Math.round(this.z * Math.pow(10, 6)) / Math.pow(10, 6))); statement.setInt(7, this.rotation); statement.setString(8, this instanceof InteractionGuildGate ? "" : this.getDatabaseExtraData()); statement.setString(9, this.limitedStack + ":" + this.limitedSells);