diff --git a/resources/config/v12/de/config.yml b/resources/config/v12/de/config.yml index 518461f..003bde4 100644 --- a/resources/config/v12/de/config.yml +++ b/resources/config/v12/de/config.yml @@ -38,6 +38,9 @@ pukeItem: SOUL_SAND # Wurde die item Despawnzeit in der spigot.yml verändert, verändert sich auch die pukeDespawnzeit in Abhängigkeit. pukeDespawntime: 60 +# Ob seine Betrunkenheit dem Spieler kurz angezeigt werden soll wenn er etwas trinkt oder ein drainItem isst. [true] +showStatusOnDrink: true + # Konsumierbares Item/Stärke. Senkt den Alkoholpegel um wenn konsumiert. drainItems: - BREAD/4 diff --git a/resources/config/v12/en/config.yml b/resources/config/v12/en/config.yml index 493e236..9258e09 100644 --- a/resources/config/v12/en/config.yml +++ b/resources/config/v12/en/config.yml @@ -38,6 +38,9 @@ pukeItem: SOUL_SAND # If the item despawn time was changed in the spigot.yml, the pukeDespawntime changes as well. pukeDespawntime: 60 +# Display his drunkeness to the player when he drinks a brew or eats a drainItem [true] +showStatusOnDrink: true + # Consumable Item/strength. Decreases the alcohol level by when consumed. (list) drainItems: - BREAD/4 diff --git a/resources/config/v12/fr/config.yml b/resources/config/v12/fr/config.yml index a0a6000..f956880 100644 --- a/resources/config/v12/fr/config.yml +++ b/resources/config/v12/fr/config.yml @@ -39,6 +39,9 @@ pukeItem: SOUL_SAND # If the item despawn time was changed in the spigot.yml, the pukeDespawntime changes as well. pukeDespawntime: 60 +# Display his drunkeness to the player when he drinks a brew or eats a drainItem [true] +showStatusOnDrink: true + # Consommables Objet/Force. Réduit le montant d'alcool par lors de la consommation. (list) drainItems: - BREAD/4 diff --git a/resources/config/v12/it/config.yml b/resources/config/v12/it/config.yml index 7923227..331bbf8 100644 --- a/resources/config/v12/it/config.yml +++ b/resources/config/v12/it/config.yml @@ -38,6 +38,9 @@ pukeItem: SOUL_SAND # Se il tempo di scomparsa viene cambiato in spigot.yml anche pukeDespawntime cambia. pukeDespawntime: 60 +# Display his drunkeness to the player when he drinks a brew or eats a drainItem [true] +showStatusOnDrink: true + # Oggetto consumabile/forza. Questi oggetti se consumati calano il livello di alcool (della "forza" che avevi impsotato) (list) drainItems: - BREAD/4 diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml index 96f7d0c..cf24d8c 100644 --- a/resources/config/v13/de/config.yml +++ b/resources/config/v13/de/config.yml @@ -38,6 +38,9 @@ pukeItem: Soul_Sand # Wurde die item Despawnzeit in der spigot.yml verändert, verändert sich auch die pukeDespawnzeit in Abhängigkeit. pukeDespawntime: 60 +# Ob seine Betrunkenheit dem Spieler kurz angezeigt werden soll wenn er etwas trinkt oder ein drainItem isst. [true] +showStatusOnDrink: true + # Konsumierbares Item/Stärke. Senkt den Alkoholpegel um wenn konsumiert. drainItems: - Bread/4 diff --git a/resources/config/v13/en/config.yml b/resources/config/v13/en/config.yml index 15c5bcd..9479649 100644 --- a/resources/config/v13/en/config.yml +++ b/resources/config/v13/en/config.yml @@ -38,6 +38,9 @@ pukeItem: Soul_Sand # If the item despawn time was changed in the spigot.yml, the pukeDespawntime changes as well. pukeDespawntime: 60 +# Display his drunkeness to the player when he drinks a brew or eats a drainItem [true] +showStatusOnDrink: true + # Consumable Item/strength. Decreases the alcohol level by when consumed. (list) drainItems: - Bread/4 diff --git a/resources/config/v13/es/config.yml b/resources/config/v13/es/config.yml index 3cefb29..0c39956 100644 --- a/resources/config/v13/es/config.yml +++ b/resources/config/v13/es/config.yml @@ -38,6 +38,9 @@ pukeItem: Soul_Sand # If the item despawn time was changed in the spigot.yml, the pukeDespawntime changes as well. pukeDespawntime: 60 +# Display his drunkeness to the player when he drinks a brew or eats a drainItem [true] +showStatusOnDrink: true + # Consumable Item/strength. Decreases the alcohol level by when consumed. (list) drainItems: - Bread/4 diff --git a/resources/config/v13/fr/config.yml b/resources/config/v13/fr/config.yml index 0e1fb9f..0bf2ddc 100644 --- a/resources/config/v13/fr/config.yml +++ b/resources/config/v13/fr/config.yml @@ -39,6 +39,9 @@ pukeItem: Soul_Sand # If the item despawn time was changed in the spigot.yml, the pukeDespawntime changes as well. pukeDespawntime: 60 +# Display his drunkeness to the player when he drinks a brew or eats a drainItem [true] +showStatusOnDrink: true + # Consommables Objet/Force. Réduit le montant d'alcool par lors de la consommation. (list) drainItems: - Bread/4 diff --git a/resources/config/v13/it/config.yml b/resources/config/v13/it/config.yml index c02f374..c70b5ef 100644 --- a/resources/config/v13/it/config.yml +++ b/resources/config/v13/it/config.yml @@ -38,6 +38,9 @@ pukeItem: Soul_Sand # Se il tempo di scomparsa viene cambiato in spigot.yml anche pukeDespawntime cambia. pukeDespawntime: 60 +# Display his drunkeness to the player when he drinks a brew or eats a drainItem [true] +showStatusOnDrink: true + # Oggetto consumabile/forza. Questi oggetti se consumati calano il livello di alcool (della "forza" che avevi impsotato) (list) drainItems: - Bread/4 diff --git a/resources/config/v13/zh/config.yml b/resources/config/v13/zh/config.yml index 0626f22..6f8c78a 100644 --- a/resources/config/v13/zh/config.yml +++ b/resources/config/v13/zh/config.yml @@ -40,6 +40,9 @@ pukeItem: Soul_Sand # 如果spigot.yml中的物品消失时间被变更, 此处也会变更. pukeDespawntime: 60 +# Display his drunkeness to the player when he drinks a brew or eats a drainItem [true] +showStatusOnDrink: true + # 解酒物/解酒强度. 降低玩家一定程度的醉酒程度, 解救强度为百分数.(下列) drainItems: - Bread/4 diff --git a/src/com/dre/brewery/BPlayer.java b/src/com/dre/brewery/BPlayer.java index 3b0bbde..eb610aa 100644 --- a/src/com/dre/brewery/BPlayer.java +++ b/src/com/dre/brewery/BPlayer.java @@ -200,7 +200,9 @@ public class BPlayer { bPlayer.drinkCap(player); } bPlayer.syncToSQL(false); - bPlayer.showDrunkeness(player); + if (BConfig.showStatusOnDrink) { + bPlayer.showDrunkeness(player); + } return true; } diff --git a/src/com/dre/brewery/filedata/BConfig.java b/src/com/dre/brewery/filedata/BConfig.java index 2cb75e8..e54b32a 100644 --- a/src/com/dre/brewery/filedata/BConfig.java +++ b/src/com/dre/brewery/filedata/BConfig.java @@ -68,6 +68,7 @@ public class BConfig { //BPlayer public static Map drainItems = new HashMap<>();// DrainItem Material and Strength public static Material pukeItem; + public static boolean showStatusOnDrink; public static int pukeDespawntime; public static int hangoverTime; public static boolean overdrinkKick; @@ -235,6 +236,7 @@ public class BConfig { enableLoginDisallow = config.getBoolean("enableLoginDisallow", false); enablePuke = config.getBoolean("enablePuke", false); pukeDespawntime = config.getInt("pukeDespawntime", 60) * 20; + showStatusOnDrink = config.getBoolean("showStatusOnDrink", false); homeType = config.getString("homeType", null); craftSealingTable = config.getBoolean("craftSealingTable", false); enableSealingTable = config.getBoolean("enableSealingTable", false); diff --git a/src/com/dre/brewery/listeners/CommandListener.java b/src/com/dre/brewery/listeners/CommandListener.java index 8a64859..3b2117d 100644 --- a/src/com/dre/brewery/listeners/CommandListener.java +++ b/src/com/dre/brewery/listeners/CommandListener.java @@ -331,7 +331,9 @@ public class CommandListener implements CommandExecutor { bPlayer.remove(); } else { bPlayer.setData(drunkeness, quality); - bPlayer.showDrunkeness(player); + if (BConfig.showStatusOnDrink) { + bPlayer.showDrunkeness(player); + } } if (drunkeness > 100) { diff --git a/src/com/dre/brewery/listeners/PlayerListener.java b/src/com/dre/brewery/listeners/PlayerListener.java index 10b2a5b..da98716 100644 --- a/src/com/dre/brewery/listeners/PlayerListener.java +++ b/src/com/dre/brewery/listeners/PlayerListener.java @@ -167,7 +167,9 @@ public class PlayerListener implements Listener { BPlayer bplayer = BPlayer.get(player); if (bplayer != null) { bplayer.drainByItem(player, item.getType()); - bplayer.showDrunkeness(player); + if (BConfig.showStatusOnDrink) { + bplayer.showDrunkeness(player); + } } } }