From e97d2743fb16fb1cb0656b0b5db229726db06277 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 30 Dec 2019 23:51:12 +0800
Subject: [PATCH] Clean up

---
 app/Http/Controllers/TextureController.php |  2 +-
 app/Models/Player.php                      | 16 ----------------
 tests/ModelsTest/PlayerTest.php            | 11 -----------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/app/Http/Controllers/TextureController.php b/app/Http/Controllers/TextureController.php
index fd6235ab..14be661e 100644
--- a/app/Http/Controllers/TextureController.php
+++ b/app/Http/Controllers/TextureController.php
@@ -137,7 +137,7 @@ class TextureController extends Controller
         $player = Player::where('name', $name)->first();
         abort_unless($player, 404);
 
-        $hash = $player->getTexture('skin');
+        $hash = optional($player->skin)->hash;
         if (Storage::disk('textures')->has($hash)) {
             $png = Minecraft::generateAvatarFromSkin(
                 Storage::disk('textures')->read($hash),
diff --git a/app/Models/Player.php b/app/Models/Player.php
index 48a6fc05..8a0fd973 100644
--- a/app/Models/Player.php
+++ b/app/Models/Player.php
@@ -73,20 +73,4 @@ class Player extends Model
 
         return json_encode($profile, $options | JSON_UNESCAPED_UNICODE);
     }
-
-    /**
-     * Get specific texture of player.
-     *
-     * @param string $type "skin" or "cape"
-     *
-     * @return string the sha256 hash of texture file
-     */
-    public function getTexture($type)
-    {
-        if (in_array($type, self::$types)) {
-            return Arr::get(Texture::find($this["tid_$type"]), 'hash');
-        }
-
-        return false;
-    }
 }
diff --git a/tests/ModelsTest/PlayerTest.php b/tests/ModelsTest/PlayerTest.php
index 9c2f38c3..fce2ebff 100644
--- a/tests/ModelsTest/PlayerTest.php
+++ b/tests/ModelsTest/PlayerTest.php
@@ -10,17 +10,6 @@ class PlayerTest extends TestCase
 {
     use DatabaseTransactions;
 
-    public function testGetTexture()
-    {
-        $skin = factory(Texture::class)->create();
-        $player = factory(Player::class)->create(['tid_skin' => $skin->tid]);
-
-        $player = Player::find($player->pid);
-        $this->assertEquals($skin->hash, $player->getTexture('skin'));
-
-        $this->assertFalse($player->getTexture('invalid_type'));
-    }
-
     public function testGetModelAttribute()
     {
         $player = factory(Player::class)->create();