FatBoy/lakebane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

zone override

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-02-24 21:44:23 -06:00
parent c3c897b035
commit 83c8698798
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/City.java
-16
View File
@@ -75,9 +75,6 @@ public class City extends AbstractWorldObject {
private byte isCapital = 0; private byte isCapital = 0;
private byte isSafeHold; private byte isSafeHold;
private boolean forceRename = false; private boolean forceRename = false;
private boolean noTeleport = false; //used by npc cities
private boolean noRepledge = false; //used by npc cities
private boolean isOpen = false;
private int treeOfLifeID; private int treeOfLifeID;
private Vector3fImmutable location = Vector3fImmutable.ZERO; private Vector3fImmutable location = Vector3fImmutable.ZERO;
@@ -142,14 +139,6 @@ public class City extends AbstractWorldObject {
this.forceRename = rs.getInt("forceRename") == 1; this.forceRename = rs.getInt("forceRename") == 1;
this.open = rs.getInt("open") == 1; this.open = rs.getInt("open") == 1;
if (this.cityName.equals("Perdition") || this.cityName.equals("Bastion")) {
this.noTeleport = true;
this.noRepledge = true;
} else {
this.noTeleport = false;
this.noRepledge = false;
}
this.hash = rs.getString("hash"); this.hash = rs.getString("hash");
if (this.motto.isEmpty()) { if (this.motto.isEmpty()) {
@@ -356,9 +345,6 @@ public class City extends AbstractWorldObject {
if (ago.getObjectType().equals(GameObjectType.City)) { if (ago.getObjectType().equals(GameObjectType.City)) {
City city = (City) ago; City city = (City) ago;
if (city.noTeleport && city.getObjectUUID() != 34275 && city.getObjectUUID() != 34081)
continue;
if (city.parentZone != null && city.parentZone.isPlayerCity()) { if (city.parentZone != null && city.parentZone.isPlayerCity()) {
if (pc.getAccount().status.equals(AccountStatus.ADMIN)) { if (pc.getAccount().status.equals(AccountStatus.ADMIN)) {
@@ -412,8 +398,6 @@ public class City extends AbstractWorldObject {
for (AbstractGameObject ago : worldCities.values()) { for (AbstractGameObject ago : worldCities.values()) {
if (ago.getObjectType().equals(GameObjectType.City)) { if (ago.getObjectType().equals(GameObjectType.City)) {
City city = (City) ago; City city = (City) ago;
if (city.noRepledge)
continue;
if (city.parentZone != null && city.parentZone.isPlayerCity()) { if (city.parentZone != null && city.parentZone.isPlayerCity()) {