SmrPlanet: clean up Owner methods (#913)

* Remove `isClaimed` (duplicate of `hasOwner`). * Rename `removeClaimed` to `removeOwner` (since all other similar method names refer to the "owner").
smrealms · Nov 6, 2020 · 34c4d98 · 34c4d98
1 parent d7448c3
commit 34c4d98
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/engine/Default/planet_attack_processing.php b/engine/Default/planet_attack_processing.php
@@ -23,7 +23,7 @@
 if (!$planet->exists()) {
 	create_error('This planet does not exist.');
 }
-if (!$planet->isClaimed()) {
+if (!$planet->hasOwner()) {
 	create_error('This planet is not claimed.');
 }
 
@@ -75,7 +75,7 @@
 
 if ($planet->isDestroyed()) {
 	$db->query('UPDATE player SET land_on_planet = \'FALSE\' WHERE sector_id = ' . $db->escapeNumber($planet->getSectorID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
-	$planet->removeClaimed();
+	$planet->removeOwner();
 	$planet->removePassword();
 
 	// Prepare message for planet owners

diff --git a/lib/Default/SmrPlanet.class.php b/lib/Default/SmrPlanet.class.php
@@ -231,6 +231,10 @@ public function hasOwner() {
 		return $this->ownerID != 0;
 	}
 
+	public function removeOwner() {
+		$this->setOwnerID(0);
+	}
+
 	public function setOwnerID($claimerID) {
 		if ($this->ownerID == $claimerID) {
 			return;
@@ -1025,14 +1029,6 @@ public function getInhabitableTime() {
 		return $this->inhabitableTime;
 	}
 
-	public function isClaimed() {
-		return $this->ownerID > 0;
-	}
-
-	public function removeClaimed() {
-		$this->setOwnerID(0);
-	}
-
 	public function getExamineHREF() {
 		return SmrSession::getNewHREF(create_container('skeleton.php', 'planet_examine.php'));
 	}
@@ -1297,7 +1293,7 @@ public function &killPlanetByPlayer(AbstractSmrPlayer $killer) {
 
 		//kick everyone from planet
 		$this->db->query('UPDATE player SET land_on_planet = \'FALSE\' WHERE ' . $this->SQL);
-		$this->removeClaimed();
+		$this->removeOwner();
 		$this->removePassword();
 		return $return;
 	}

diff --git a/templates/Default/engine/Default/planet_financial.php b/templates/Default/engine/Default/planet_financial.php
@@ -15,7 +15,7 @@
 	<p>&nbsp;</p> <?php
 
 // Print bond properties if the planet is claimed
-if (!$ThisPlanet->isClaimed()) {
+if (!$ThisPlanet->hasOwner()) {
 	echo "This planet must be claimed before you can bond funds here.<br /><br />";
 } else { ?>
 	You are able to transfer these credits into a planetary bond.<br />
@@ -34,7 +34,7 @@
 </span><?php
 
 // Allow the player to bond if the planet is claimed
-if ($ThisPlanet->isClaimed()) { ?>
+if ($ThisPlanet->hasOwner()) { ?>
 	<div class="buttonA">
 		<a id="bondFunds" class="buttonA" href="<?php echo $ThisPlanet->getBondConfirmationHREF(); ?>">Bond Funds</a>
 	</div>&nbsp; <?php