minor fix for door glitch (#123)

* running locally env - null password given

* open door from distance fix, needs improvment
This commit is contained in:
LeonBeilis
2019-10-27 21:14:53 +02:00
committed by Daniel Ginovker
parent dd206ece70
commit abcb1133d8
2 changed files with 494 additions and 492 deletions
@@ -7,7 +7,7 @@ import java.util.Scanner;
import redone.Server;
import redone.game.objects.Objects;
import redone.game.players.Player;
public class Doors {
@@ -54,7 +54,7 @@ public class Doors {
return null;
}
public boolean handleDoor(int id, int x, int y, int z) {
public boolean handleDoor(int id, int x, int y, int z, Player player) {
Doors d = getDoor(id, x, y, z);
@@ -64,6 +64,10 @@ public class Doors {
}
return false;
}
//todo: improvment: if player manage to get to door then open the door.
if(player.distanceToPoint(x, y) > 1) return false;
int xAdjustment = 0, yAdjustment = 0;
if (d.type == 0) {
if (d.open == 0) {
@@ -117,11 +117,9 @@ public class ClickObject implements PacketType {
if (player.playerRights == 3 || player.debugMode) {
player.getActionSender().sendMessage("ObjectId: " + player.objectId + " ObjectX: " + player.objectX + " ObjectY: " + player.objectY + " Objectclick = 1, Xoff: " + (player.getX() - player.objectX) + " Yoff: " + (player.getY() - player.objectY));
}
//if(player.goodDistance(player.getX(), player.getY(), player.objectX, player.objectY, 1)) {
if (Doors.getSingleton().handleDoor(player.objectId, player.objectX, player.objectY, player.heightLevel)) {
//System.out.println("Door debug?");
}
//}
//todo: check if it's a door before fire handle
Doors.getSingleton().handleDoor(player.objectId, player.objectX, player.objectY, player.heightLevel, player);
/*if (client.performingAction) {
return;