Merge remote-tracking branch 'origin/development' into development

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
 variables:
   name: "EpicVouchers"
   path: "/builds/$CI_PROJECT_PATH"
-  version: "2.1.2"
+  version: "2.1.5"
 
 build:
   stage: build

EpicVouchers.iml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />

src/main/java/com/songoda/epicvouchers/listeners/PlayerInteractListener.java

@@ -29,7 +29,7 @@ public class PlayerInteractListener implements Listener {
 
         for (Voucher voucher : instance.getVouchers().values()) {
             Player player = event.getPlayer();
-            if (!player.hasPermission(voucher.getPermission())) {
+            if (!player.hasPermission(voucher.getPermission()) && !voucher.getPermission().isEmpty()) {
                 continue;
             }
 

src/main/java/com/songoda/epicvouchers/voucher/Voucher.java

@@ -141,6 +141,7 @@ public class Voucher {
     }
 
     public void give(CommandSender sender, List<Player> players, int amount) {
+
         String giveMessage = instance.getLocale().getMessage("command.give.send")
                 .processPlaceholder("%player%", players.size() == 1 ? players.get(0).getName() : "everyone")
                 .processPlaceholder("%voucher%", Matcher.quoteReplacement(getName(true)))
@@ -148,7 +149,7 @@ public class Voucher {
 
         for (Player player : players) {
             String receiveMessage = instance.getLocale().getMessage("command.give.receive")
-                    .processPlaceholder("%voucher%", getName(true))
+                    .processPlaceholder("%voucher%", Matcher.quoteReplacement(getName(true))
                     .processPlaceholder("%player%", player.getName())
                     .processPlaceholder("%amount%", String.valueOf(amount)).getPrefixedMessage();