Fixed a bug where admin shops would show the "Not enough stock" error…

… message
Sven65 · Mar 2, 2021 · 304a291 · 304a291
1 parent c001588
commit 304a291
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/modules/1_10_R1/pom.xml b/modules/1_10_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_11_R1/pom.xml b/modules/1_11_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_12_R1/pom.xml b/modules/1_12_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_13_R1/pom.xml b/modules/1_13_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_13_R2/pom.xml b/modules/1_13_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_14_R1/pom.xml b/modules/1_14_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_15_R1/pom.xml b/modules/1_15_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_16_R1/pom.xml b/modules/1_16_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_16_R2/pom.xml b/modules/1_16_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_16_R3/pom.xml b/modules/1_16_R3/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_8_R1/pom.xml b/modules/1_8_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_8_R2/pom.xml b/modules/1_8_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_8_R3/pom.xml b/modules/1_8_R3/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_9_R1/pom.xml b/modules/1_9_R1/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/1_9_R2/pom.xml b/modules/1_9_R2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/Dist/pom.xml b/modules/Dist/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>xyz.mackan</groupId>
         <artifactId>Slabbo-parent</artifactId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/Plugin/pom.xml b/modules/Plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <artifactId>Slabbo-parent</artifactId>
         <groupId>xyz.mackan</groupId>
-        <version>1.0.22</version>
+        <version>1.0.23</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopUserGUI.java b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopUserGUI.java
@@ -89,7 +89,7 @@ public void handleBuy (HumanEntity humanEntity) {
 			return;
 		}
 
-		if (shop.stock < shop.quantity) {
+		if (shop.stock < shop.quantity && !shop.admin) {
 			humanEntity.sendMessage(ChatColor.RED+LocaleManager.getString("error-message.shop-errors.not-enough-stock"));
 			((Player) humanEntity).playSound(shop.location, slabboSound.getSoundByKey("BLOCKED"), 1, 1);
 			return;

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>xyz.mackan</groupId>
     <artifactId>Slabbo-parent</artifactId>
-    <version>1.0.22</version>
+    <version>1.0.23</version>
     <packaging>pom</packaging>
     <name>Slabbo</name>