From 47ad7a35dcfea8363e6b51fe242e3900e46da837 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Wed, 8 Dec 2021 22:45:23 +0000 Subject: [PATCH] Fix NPE when pulling an event with no type I assume people have broken coroutine dispatchers - I didn't think it was possible to queue an actual event with no type. See cc-tweaked/cc-restitched#31. Will fix it too once merged downstream! --- src/main/java/dan200/computercraft/api/lua/MethodResult.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/dan200/computercraft/api/lua/MethodResult.java b/src/main/java/dan200/computercraft/api/lua/MethodResult.java index 7d15d60b7..88342fe85 100644 --- a/src/main/java/dan200/computercraft/api/lua/MethodResult.java +++ b/src/main/java/dan200/computercraft/api/lua/MethodResult.java @@ -98,7 +98,10 @@ public static MethodResult pullEvent( @Nullable String filter, @Nonnull ILuaCall { Objects.requireNonNull( callback, "callback cannot be null" ); return new MethodResult( new Object[] { filter }, results -> { - if( results.length >= 1 && results[0].equals( "terminate" ) ) throw new LuaException( "Terminated", 0 ); + if( results.length >= 1 && Objects.equals( results[0], "terminate" ) ) + { + throw new LuaException( "Terminated", 0 ); + } return callback.resume( results ); } ); }