From ea7c46f6e895a4bca5a5f3f85fd1f29899930d7d Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 16 Sep 2019 21:55:59 +0000
Subject: [PATCH] Reset WorldObject position upon decay.

---
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 .../java/org/l2jmobius/gameserver/model/WorldObject.java        | 2 +-
 .../org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java  | 1 +
 28 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java
index ec34f7249d..3f15babfa4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -66,7 +66,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index 565d1210b0..445937a68f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java
index 89b94bb65b..8cbf03fdc5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -63,7 +63,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	/** Y coordinate */
 	private volatile int _y = 0;
 	/** Z coordinate */
-	private volatile int _z = 0;
+	private volatile int _z = -10000;
 	/** Orientation */
 	private volatile int _heading = 0;
 	/** Instance id of object. 0 - Global */
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
index d340d3002d..4deb727558 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
@@ -45,6 +45,7 @@ public class DecayTaskManager
 					final Creature creature = entry.getKey();
 					DECAY_SCHEDULES.remove(creature);
 					creature.onDecay();
+					creature.setXYZ(0, 0, -10000);
 				}
 			}
 		}, 0, 1000);