Added potion world rule #69

Author: jarne

README.md

@@ -64,6 +64,7 @@ Please report bugs on the issues page on GitHub.
     - Fly
     - Daylight cycle
     - Leaves decay
+    - Potion
     - You have an idea what to add? Feel free to open an issue.
 - **DEFAULT VALUES** Set default values for worlds without settings
 - **SOPHISTICATED** Easy to use, fast and mostly bug-free.
@@ -84,15 +85,15 @@ Worlds is really easy to use. Here is the command syntax:
 /worlds set legacy
 /worlds set permission <permissionstring>
 /worlds set gamemode <survival|creative|adventure|spectator>
-/worlds set <build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay> <true|false>
+/worlds set <build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay|potion> <true|false>
 /worlds unset
-/worlds unset <permission|gamemode|build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay>
+/worlds unset <permission|gamemode|build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay|potion>
 /worlds defaults
 /worlds defaults legacy
 /worlds defaults set permission <permissionstring>
 /worlds defaults set gamemode <survival|creative|adventure|spectator>
-/worlds defaults set <build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay> <true|false>
-/worlds defaults unset <permission|gamemode|build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay>
+/worlds defaults set <build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay|potion> <true|false>
+/worlds defaults unset <permission|gamemode|build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay|potion>
 ```
 
 For a full list of commands, their usage and a description what they are for, take a look at the [wiki](https://plugins.surva.net/docs/Worlds#commands).

plugin.yml

@@ -10,7 +10,7 @@ website: https://plugins.surva.net/#worlds
 commands:
   worlds:
     description: "Worlds plugin main command"
-    usage: "/worlds list\n/worlds create <worldname> [type]\n/worlds <remove|load|unload|tp> <worldname>\n/worlds <copy|rename> <from> <to>\n/worlds set\n/worlds set legacy\n/worlds set permission <permissionstring>\n/worlds set gamemode <survival|creative|adventure|spectator>\n/worlds set <build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay> <true|false>\n/worlds unset\n/worlds unset <permission|gamemode|build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay>\n/worlds defaults\n/worlds defaults legacy\n/worlds defaults set permission <permissionstring>\n/worlds defaults set gamemode <survival|creative|adventure|spectator>\n/worlds defaults set <build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay> <true|false>\n/worlds defaults unset <permission|gamemode|build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay>"
+    usage: "/worlds list\n/worlds create <worldname> [type]\n/worlds <remove|load|unload|tp> <worldname>\n/worlds <copy|rename> <from> <to>\n/worlds set\n/worlds set legacy\n/worlds set permission <permissionstring>\n/worlds set gamemode <survival|creative|adventure|spectator>\n/worlds set <build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay|potion> <true|false>\n/worlds unset\n/worlds unset <permission|gamemode|build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay|potion>\n/worlds defaults\n/worlds defaults legacy\n/worlds defaults set permission <permissionstring>\n/worlds defaults set gamemode <survival|creative|adventure|spectator>\n/worlds defaults set <build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay|potion> <true|false>\n/worlds defaults unset <permission|gamemode|build|pvp|damage|interact|explode|drop|hunger|fly|daylightcycle|leavesdecay|potion>"
     aliases: ["ws"]
 permissions:
   worlds.list:

resources/languages/de.yml

@@ -71,7 +71,7 @@ teleport:
 set:
   success: "§aDu hast §b{key} §ain §f{world} §aauf §c{value} §agesetzt."
   list:
-    values: "§Einstellungen für die Welt §f{name}\n\n§eberechtigung: {permission}\n§egamemode: {gamemode}\n§ebauen: {build}\n§epvp: {pvp}\n§eschaden: {damage}\n§einteragieren: {interact}\n§eexplosionen: {explode}\n§edrop: {drop}\n§ehunger: {hunger}\n§efliegen: {fly}\n§etag-nacht-zyklus: {daylightcycle}\n§eblätter verwesen: {leavesdecay}\n"
+    values: "§Einstellungen für die Welt §f{name}\n\n§eberechtigung: {permission}\n§egamemode: {gamemode}\n§ebauen: {build}\n§epvp: {pvp}\n§eschaden: {damage}\n§einteragieren: {interact}\n§eexplosionen: {explode}\n§edrop: {drop}\n§ehunger: {hunger}\n§efliegen: {fly}\n§etag-nacht-zyklus: {daylightcycle}\n§eblätter verwesen: {leavesdecay}\n§ezaubertränke: {potion}\n"
     notset: "§7nicht gesetzt"
   permission:
     notdefault: "§cDu kannst keine Berechtigung für die Standard-Welt setzen."
@@ -86,7 +86,7 @@ unset:
 # Defaults command
 defaults:
   list:
-    values: "§Einstellungen für Welten auf diesem Server\n\n§eberechtigung: {permission}\n§egamemode: {gamemode}\n§ebauen: {build}\n§epvp: {pvp}\n§eschaden: {damage}\n§einteragieren: {interact}\n§eexplosionen: {explode}\n§edrop: {drop}\n§ehunger: {hunger}\n§efliegen: {fly}\n§etag-nacht-zyklus: {daylightcycle}\n§eblätter verwesen: {leavesdecay}\n"
+    values: "§Einstellungen für Welten auf diesem Server\n\n§eberechtigung: {permission}\n§egamemode: {gamemode}\n§ebauen: {build}\n§epvp: {pvp}\n§eschaden: {damage}\n§einteragieren: {interact}\n§eexplosionen: {explode}\n§edrop: {drop}\n§ehunger: {hunger}\n§efliegen: {fly}\n§etag-nacht-zyklus: {daylightcycle}\n§eblätter verwesen: {leavesdecay}\n§ezaubertränke: {potion}\n"
     notset: "§7nicht gesetzt"
   set:
     success: "§aDu hast §b{key} §aauf §c{value} §aals Standard-Wert gesetzt."
@@ -111,6 +111,7 @@ forms:
       fly: "Fliegen"
       daylightcycle: "Tag-Nacht-Zyklus"
       leavesdecay: "Blätter verwesen"
+      potion: "Zaubertränke"
     options:
       notset: "§7nicht eingestellt (kein Wert)"
       true: "§aaktiviert"

resources/languages/en.yml

@@ -71,7 +71,7 @@ teleport:
 set:
   success: "§aYou've set §b{key} §ain §f{world} §ato §c{value}§a."
   list:
-    values: "§cSettings for world §f{name}\n\n§epermission: {permission}\n§egamemode: {gamemode}\n§ebuild: {build}\n§epvp: {pvp}\n§edamage: {damage}\n§einteract: {interact}\n§eexplode: {explode}\n§edrop: {drop}\n§ehunger: {hunger}\n§efly: {fly}\n§edaylightcycle: {daylightcycle}\n§eleavesdecay: {leavesdecay}\n"
+    values: "§cSettings for world §f{name}\n\n§epermission: {permission}\n§egamemode: {gamemode}\n§ebuild: {build}\n§epvp: {pvp}\n§edamage: {damage}\n§einteract: {interact}\n§eexplode: {explode}\n§edrop: {drop}\n§ehunger: {hunger}\n§efly: {fly}\n§edaylightcycle: {daylightcycle}\n§eleavesdecay: {leavesdecay}\n§epotion: {potion}\n"
     notset: "§7not set"
   permission:
     notdefault: "§cYou can't set a permission on the default world."
@@ -86,7 +86,7 @@ unset:
 # Defaults command
 defaults:
   list:
-    values: "§cDefault settings for worlds on this server\n\n§epermission: {permission}\n§egamemode: {gamemode}\n§ebuild: {build}\n§epvp: {pvp}\n§edamage: {damage}\n§einteract: {interact}\n§eexplode: {explode}\n§edrop: {drop}\n§ehunger: {hunger}\n§efly: {fly}\n§edaylightcycle: {daylightcycle}\n§eleavesdecay: {leavesdecay}\n"
+    values: "§cDefault settings for worlds on this server\n\n§epermission: {permission}\n§egamemode: {gamemode}\n§ebuild: {build}\n§epvp: {pvp}\n§edamage: {damage}\n§einteract: {interact}\n§eexplode: {explode}\n§edrop: {drop}\n§ehunger: {hunger}\n§efly: {fly}\n§edaylightcycle: {daylightcycle}\n§eleavesdecay: {leavesdecay}\n§epotion: {potion}\n"
     notset: "§7not set"
   set:
     success: "§aYou've set §b{key} §ato §c{value} §aas default value."
@@ -111,6 +111,7 @@ forms:
       fly: "Flying"
       daylightcycle: "Daylight cycling"
       leavesdecay: "Leaves decay"
+      potion: "Potion"
     options:
       notset: "§7not set (null)"
       true: "§aenabled"

src/surva/worlds/EventListener.php

@@ -21,8 +21,10 @@
 use pocketmine\event\player\PlayerDropItemEvent;
 use pocketmine\event\player\PlayerExhaustEvent;
 use pocketmine\event\player\PlayerInteractEvent;
+use pocketmine\event\player\PlayerItemConsumeEvent;
 use pocketmine\event\player\PlayerJoinEvent;
 use pocketmine\item\PaintingItem;
+use pocketmine\item\Potion;
 use pocketmine\item\TieredTool;
 use pocketmine\Player;
 
@@ -320,6 +322,26 @@ public function onLeavesDecay(LeavesDecayEvent $event): void
         }
     }
 
+    /**
+     * @param  \pocketmine\event\player\PlayerItemConsumeEvent  $event
+     */
+    public function onPlayerItemConsume(PlayerItemConsumeEvent $event): void
+    {
+        $player     = $event->getPlayer();
+        $item       = $event->getItem();
+        $foldername = $player->getLevel()->getFolderName();
+
+        if (!($item instanceof Potion)) {
+            return;
+        }
+
+        if ($world = $this->getWorlds()->getWorldByName($foldername)) {
+            if ($world->getPotion() === false) {
+                $event->setCancelled();
+            }
+        }
+    }
+
     /**
      * @return Worlds
      */

src/surva/worlds/commands/DefaultsCommand.php

@@ -53,6 +53,7 @@ public function do(CommandSender $sender, array $args): bool
                       "fly" => $this->formatBool($defaults->getFly()),
                       "daylightcycle" => $this->formatBool($defaults->getDaylightCycle()),
                       "leavesdecay" => $this->formatBool($defaults->getLeavesDecay()),
+                      "potion" => $this->formatBool($defaults->getPotion()),
                     ]
                   )
                 );

src/surva/worlds/commands/SetCommand.php

@@ -59,6 +59,7 @@ public function do(CommandSender $sender, array $args): bool
                   "fly"           => $this->formatBool($world->getFly()),
                   "daylightcycle" => $this->formatBool($world->getDaylightCycle()),
                   "leavesdecay"   => $this->formatBool($world->getLeavesDecay()),
+                  "potion"        => $this->formatBool($world->getPotion()),
                 ]
               )
             );

src/surva/worlds/types/World.php

@@ -54,6 +54,9 @@ class World
     /* @var bool|null */
     protected $leavesdecay;
 
+    /* @var bool|null */
+    protected $potion;
+
     public function __construct(Worlds $worlds, Config $config)
     {
         $this->worlds = $worlds;
@@ -135,6 +138,14 @@ public function removeValue(string $name): void
         $this->loadItems();
     }
 
+    /**
+     * @return bool|null
+     */
+    public function getPotion(): ?bool
+    {
+        return $this->potion;
+    }
+
     /**
      * @return bool|null
      */

src/surva/worlds/utils/Flags.php

@@ -52,6 +52,9 @@ class Flags
         "leavesdecay"   => [
           "type" => self::TYPE_BOOL,
         ],
+        "potion"        => [
+          "type" => self::TYPE_BOOL,
+        ],
       ];
 
     public const AVAILABLE_DEFAULT_FLAGS
@@ -89,6 +92,9 @@ class Flags
         "leavesdecay"   => [
           "type" => self::TYPE_BOOL,
         ],
+        "potion"        => [
+          "type" => self::TYPE_BOOL,
+        ],
       ];
 
 }