From 90eceb92dbe8e46008a69a27512223f804d6ef4a Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Wed, 20 May 2020 12:43:16 +0200 Subject: [PATCH] Added dragonblock.player.setGamemode() --- README | 8 ++++---- engine/player.js | 15 +++++++++------ game/commands/init.js | 4 ++-- settings.json | 1 - 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README b/README index 6f78726..a20cfeb 100755 --- a/README +++ b/README @@ -1,9 +1,9 @@ Dragonblocks JavaScript Edition 3.0 -Engine: +Engine & Game: by Elias Fleckenstein - based on the Gravity Engine by Elias Fleckenstein, DerZombiiie, SC++ -Game: - by Elias Fleckenstein & DerZombiiie + based on the Gravity Engine & Dragonblocks Game by Elias Fleckenstein, DerZombiiie, SC++ +Documentation: + - HimbeerserverDE Thanks to the Dragonblocks Modding Team: - HimbeerserverDE - DerZombiiie diff --git a/engine/player.js b/engine/player.js index 7bdae71..493c522 100755 --- a/engine/player.js +++ b/engine/player.js @@ -181,6 +181,15 @@ dragonblocks.Player = class extends dragonblocks.SpawnedEntity{ return this.meta.skin; } set gamemode(mode){ + this.setGamemode(mode); + } + get gamemode(){ + return this.meta.creative ? "creative" : "survival"; + } + get tool(){ + return dragonblocks.getTool(this.getWieldedItem().item) || this.tmp.defaultTool; + } + setGamemode(mode){ switch(mode.toString().toLowerCase()){ case "0": case "survival": @@ -197,12 +206,6 @@ dragonblocks.Player = class extends dragonblocks.SpawnedEntity{ this.tmp.defaultTool = dragonblocks.getTool(this.meta.creative ? "dragonblocks:creative_hand" : "dragonblocks:hand"); return true; } - get gamemode(){ - return this.meta.creative ? "creative" : "survival"; - } - get tool(){ - return dragonblocks.getTool(this.getWieldedItem().item) || this.tmp.defaultTool; - } inventoryIsOpen(){ return this.tmp.inventory.opened; } diff --git a/game/commands/init.js b/game/commands/init.js index bbe3507..22f2137 100755 --- a/game/commands/init.js +++ b/game/commands/init.js @@ -98,11 +98,11 @@ dragonblocks.registerChatcommand({ dragonblocks.registerChatcommand({ name: "gamemode", desc: "Set your gamemode", - param: "survival | creative", + param: "survival | 0 | creative | 1", func: arg => { if(! arg) dragonblocks.chatMessage("Current Gamemode is " + dragonblocks.player.gamemode + "."); - else if(dragonblocks.player.gamemode = arg) + else if(dragonblocks.player.setGamemode(arg)) dragonblocks.chatMessage("Set Gamemode to " + arg + "."); else dragonblocks.chatMessage("Gamemode could not been set to " + arg + "."); diff --git a/settings.json b/settings.json index 39d34cb..a132807 100755 --- a/settings.json +++ b/settings.json @@ -3,7 +3,6 @@ "major": 3, "minor": 0, "patch": 0, - "snapshot": 24, "copyright": "© 2019 - 2020 Elidragon. Please Distribute!" }, "inventory": { -- 2.44.0