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

Start refactor to use templates

Browse Source
This commit is contained in:
MagicBot
2023-10-20 17:01:42 -04:00
parent cb0ba901de
commit 091b1a1d5b
8 changed files with 46 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCharacter.java
+11 -11
View File
@@ -1507,16 +1507,16 @@ public class PlayerCharacter extends AbstractCharacter {
return true;
Zone zone = ZoneManager.findSmallestZone(breather.getLoc());
if (zone.seaLevel != 0) {
if (zone.sea_level != 0) {
float localAltitude = breather.getLoc().y;
if (localAltitude + breather.characterHeight < zone.seaLevel - 2)
if (localAltitude + breather.characterHeight < zone.sea_level - 2)
return false;
if (breather.isMoving()) {
if (localAltitude + breather.characterHeight < zone.seaLevel)
if (localAltitude + breather.characterHeight < zone.sea_level)
return false;
}
} else {
@@ -1547,12 +1547,12 @@ public class PlayerCharacter extends AbstractCharacter {
Zone zone = ZoneManager.findSmallestZone(enterer.getLoc());
if (zone.seaLevel != 0) {
if (zone.sea_level != 0) {
float localAltitude = enterer.getLoc().y + enterer.characterHeight;
if (localAltitude < zone.seaLevel)
if (localAltitude < zone.sea_level)
return true;
} else {
if (enterer.getLoc().y + enterer.characterHeight < 0)
@@ -1579,12 +1579,12 @@ public class PlayerCharacter extends AbstractCharacter {
leaveWater = 1f;
if (zone.seaLevel != 0) {
if (zone.sea_level != 0) {
float localAltitude = leaver.getLoc().y;
if (localAltitude + leaveWater < zone.seaLevel)
if (localAltitude + leaveWater < zone.sea_level)
return false;
} else {
if (leaver.getLoc().y + leaveWater < 0)
@@ -4739,10 +4739,10 @@ public class PlayerCharacter extends AbstractCharacter {
Zone zone = ZoneManager.findSmallestZone(this.getLoc());
if (zone.seaLevel != 0) {
if (zone.sea_level != 0) {
float localAltitude = this.getLoc().y + this.centerHeight;
if (localAltitude < zone.seaLevel)
if (localAltitude < zone.sea_level)
return true;
} else {
if (this.getLoc().y + this.centerHeight < 0)
@@ -4764,9 +4764,9 @@ public class PlayerCharacter extends AbstractCharacter {
Zone zone = ZoneManager.findSmallestZone(currentLoc);
if (zone.seaLevel != 0) {
if (zone.sea_level != 0) {
if (localAltitude < zone.seaLevel)
if (localAltitude < zone.sea_level)
return true;
} else {
if (localAltitude < 0)