Merge pull request OpenDominion#558 from WaveHack/bugfix/op-center-br…

…eaks-on-clairvoyance Made InfoOp nullable, also added null check in view.
WaveHack · Jun 16, 2019 · c01775c · c01775c
2 parents 5b26dda + 5669320
commit c01775c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/resources/views/pages/dominion/op-center/index.blade.php b/app/resources/views/pages/dominion/op-center/index.blade.php
@@ -39,7 +39,7 @@
                                 @php
                                     $lastInfoOp = $infoOpService->getLastInfoOp($selectedDominion->realm, $dominion);
                                 @endphp
-                                @if ($lastInfoOp->isInvalid())
+                                @if ($lastInfoOp == null || $lastInfoOp->isInvalid())
                                     @continue
                                 @endif
                                 <tr>
@@ -117,7 +117,7 @@
                                 @php
                                     $lastInfoOp = $infoOpService->getLastClairvoyance($selectedDominion->realm, $realm);
                                 @endphp
-                                @if ($lastInfoOp->isInvalid())
+                                @if ($lastInfoOp == null || $lastInfoOp->isInvalid())
                                     @continue
                                 @endif
                                 <tr>

diff --git a/src/Services/Dominion/InfoOpService.php b/src/Services/Dominion/InfoOpService.php
@@ -185,7 +185,7 @@ public function getNetworthString(Realm $sourceRealm, Dominion $targetDominion):
         return $return;
     }
 
-    public function getLastInfoOp(Realm $sourceRealm, Dominion $targetDominion): InfoOp
+    public function getLastInfoOp(Realm $sourceRealm, Dominion $targetDominion): ?InfoOp
     {
         return $sourceRealm->infoOps->filter(function ($infoOp) use ($targetDominion) {
             return ($infoOp->target_dominion_id === $targetDominion->id && $infoOp->type != 'clairvoyance');
@@ -206,7 +206,7 @@ public function getLastInfoOpName(Realm $sourceRealm, Dominion $targetDominion):
             ->first()['name'];
     }
 
-    public function getLastClairvoyance(Realm $sourceRealm, Realm $targetRealm): InfoOp
+    public function getLastClairvoyance(Realm $sourceRealm, Realm $targetRealm): ?InfoOp
     {
         return $sourceRealm->infoOps->filter(function ($infoOp) use ($targetRealm) {
             return ($infoOp->target_realm_id === $targetRealm->id && $infoOp->type == 'clairvoyance');