1.0

wuxie-sct · Jul 7, 2019 · 7bfde1a · 7bfde1a
1 parent a7c7fc7
commit 7bfde1a
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 11 deletions.
diff --git a/.idea/artifacts/PSRune_jar.xml b/.idea/artifacts/PSRune_jar.xml
diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/PSRune.iml b/PSRune.iml
@@ -21,15 +21,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -39,5 +30,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
   </component>
 </module>
diff --git a/src/main/java/me/wuxie/psrune/listener/RuneListener.java b/src/main/java/me/wuxie/psrune/listener/RuneListener.java
@@ -25,10 +25,13 @@ public RuneListener(PSRune plugin){
     }
     @EventHandler
     public void onClick(InventoryClickEvent e){
-        if(e.getClickedInventory()==null)return;
+        if(e.getInventory()==null)return;
         if(e.getSlot()==-1)return;
-        if(e.getClickedInventory().getHolder() instanceof Holder){
+        if(e.getInventory().getHolder() instanceof Holder){
             e.setCancelled(true);
+            if(e.getClickedInventory()!=null&& !(e.getClickedInventory().getHolder() instanceof Holder)){
+                e.setCancelled(false);
+            }
             Player player = (Player) e.getWhoClicked();
             Inventory inv = e.getClickedInventory();
             Holder holder = (Holder) inv.getHolder();