From b1eaacf93c2dca481208cfd4606fec88f301bf96 Mon Sep 17 00:00:00 2001 From: Gptaqbc <56596815+Gptaqbc@users.noreply.github.com> Date: Tue, 7 Jan 2020 17:57:08 -0500 Subject: [PATCH] Door fix to facilitate Rune Mysteries script (#350) Now some doors doesnt have forcemove anymore. --- 2006Redone Server/data/doors.txt | 3 +++ .../rebotted/game/globalworldobjects/PassDoor.java | 14 +------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/2006Redone Server/data/doors.txt b/2006Redone Server/data/doors.txt index 0b33ac55..94161175 100644 --- a/2006Redone Server/data/doors.txt +++ b/2006Redone Server/data/doors.txt @@ -599,6 +599,8 @@ 1534 2950 3214 1 0 0 1534 2963 3213 3 0 0 1534 2969 3216 0 0 0 + 11993 3109 3167 3 0 0 + 11993 3111 3162 1 0 0 11994 2972 3314 0 0 0 11994 2980 3316 0 0 0 11707 2949 3379 0 0 0 @@ -759,6 +761,7 @@ 1530 3092 3274 2 0 9 1530 3098 3270 1 0 0 1530 3100 3276 1 0 0 + 1530 3108 9570 0 0 0 22 3106 3361 1 2 0 131 3107 3367 2 0 0 136 3123 3361 3 0 0 diff --git a/2006Redone Server/src/com/rebotted/game/globalworldobjects/PassDoor.java b/2006Redone Server/src/com/rebotted/game/globalworldobjects/PassDoor.java index 28add334..f188cec9 100644 --- a/2006Redone Server/src/com/rebotted/game/globalworldobjects/PassDoor.java +++ b/2006Redone Server/src/com/rebotted/game/globalworldobjects/PassDoor.java @@ -65,10 +65,6 @@ public class PassDoor { passThroughDoor(player, objectType, 1, 0, 0, 1, 0, 0); } else if (Position.checkPosition(player, 3247, 9892, 0)) { passThroughDoor(player, objectType, 1, 0, 0, -1, 0, 0); - } else if (Position.checkPosition(player, 3108, 9570, 0)) { - passThroughDoor(player, objectType, 1, 0, 0, -1, 0, 0); - } else if (Position.checkPosition(player, 3107, 9570, 0)) { - passThroughDoor(player, objectType, 1, 0, 0, 1, 0, 0); } else if (Position.checkPosition(player, 3110, 9559, 0)) { passThroughDoor(player, objectType, 3, 0, 0, 1, 0, 0); } else if (Position.checkPosition(player, 3111, 9559, 0)) { @@ -76,15 +72,7 @@ public class PassDoor { } break; case 11993: - if (Position.checkPlayerY(player, 3167, 0)) { - passThroughDoor(player, objectType, 0, 3, 0, 0, -1, 0); - } else if (Position.checkPlayerY(player, 3166, 0)) { - passThroughDoor(player, objectType, 0, 3, 0, 0, 1, 0); - } else if (Position.checkPlayerY(player, 3163, 0) && player.absX != 3107) { - passThroughDoor(player, objectType, 2, 1, 0, 0, -1, 0); - } else if (Position.checkPlayerY(player, 3162, 0) && player.absX != 3108 && player.absX != 3106) { - passThroughDoor(player, objectType, 2, 1, 0, 0, 1, 0); - } else if (Position.checkPosition(player, 3107, 3162, 2)) { + if (Position.checkPosition(player, 3107, 3162, 2)) { passThroughDoor(player, objectType, 1, 2, 0, 1, 0, 2); } else if (Position.checkPosition(player, 3108, 3162, 2)) { passThroughDoor(player, objectType, 1, 2, 0, -1, 0, 2);