DummyPlayer: remove improper references

See smrealms#317.
hemberger · Apr 25, 2021 · 69aa33b · 69aa33b
1 parent 73195a6
commit 69aa33b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/engine/Default/combat_simulator.php b/src/engine/Default/combat_simulator.php
@@ -21,9 +21,9 @@
 			continue;
 		}
 		$usedNames[$attackerName] = true;
-		$attackers[$i] =& DummyPlayer::getCachedDummyPlayer($attackerName);
+		$attackers[$i] = DummyPlayer::getCachedDummyPlayer($attackerName);
 		$attackers[$i]->setAllianceID(1);
-		$realAttackers[$i] =& $attackers[$i];
+		$realAttackers[$i] = $attackers[$i];
 		++$i;
 	}
 
@@ -43,9 +43,9 @@
 			continue;
 		}
 		$usedNames[$defenderName] = true;
-		$defenders[$i] =& DummyPlayer::getCachedDummyPlayer($defenderName);
+		$defenders[$i] = DummyPlayer::getCachedDummyPlayer($defenderName);
 		$defenders[$i]->setAllianceID(2);
-		$realDefenders[$i] =& $defenders[$i];
+		$realDefenders[$i] = $defenders[$i];
 		++$i;
 	}
 

diff --git a/src/lib/Default/DummyPlayer.class.php b/src/lib/Default/DummyPlayer.class.php
@@ -78,18 +78,16 @@ public function cacheDummyPlayer() {
 					'VALUES (\'DummyPlayer\', '.$db->escapeString($this->getPlayerName()).', '.$db->escapeObject($this).')');
 	}
 
-	public static function &getCachedDummyPlayer($name) {
+	public static function getCachedDummyPlayer($name) {
 		$db = Smr\Database::getInstance();
 		$db->query('SELECT info FROM cached_dummys
 					WHERE type = \'DummyPlayer\'
 						AND id = ' . $db->escapeString($name) . ' LIMIT 1');
 		if($db->nextRecord()) {
-			$return = $db->getObject('info');
-			return $return;
+			return $db->getObject('info');
 		}
 		else {
-			$return = new DummyPlayer();
-			return $return;
+			return new DummyPlayer();
 		}
 	}