Browse Source

fixed bug with item use finish event, new snuvi command

Kajetan Johannes Hammerle 4 years ago
parent
commit
368d9fb2c9

+ 2 - 1
src/main/java/me/km/snuviscript/ScriptEvents.java

@@ -496,8 +496,9 @@ public class ScriptEvents {
         handleEvent(e, "item_use_finish", (sc) -> {
             setLivingEntity(sc, e.getEntityLiving());
             setItem(sc, e.getItem());
+            sc.setVar("result", e.getResultStack());
         }, (sc) -> {
-            handleVar(sc, "item_use_finish", "item", v -> {
+            handleVar(sc, "item_use_finish", "result", v -> {
                 ItemStack stack = (ItemStack) v.get(sc);
                 if(stack != null) {
                     e.setResultStack(stack);

+ 4 - 0
src/main/java/me/km/snuviscript/commands/WorldCommands.java

@@ -1,6 +1,7 @@
 package me.km.snuviscript.commands;
 
 import java.util.ArrayList;
+import java.util.stream.Collectors;
 import me.hammerle.snuviscript.code.ScriptManager;
 import me.km.utils.Location;
 import me.km.utils.Mapper;
@@ -87,5 +88,8 @@ public class WorldCommands {
             wi.setRaining(true);
             wi.setThundering(true);
         });
+        sm.registerFunction("world.getentities", (sc, in) -> {
+            return ((ServerWorld) in[0].get(sc)).getEntities().collect(Collectors.toList());
+        });
     }
 }