From c81a86b2d5937f8cef99b433cc63756374f677cb Mon Sep 17 00:00:00 2001
From: "Alex \"mcmonkey\" Goodwin" <git_commits@alexgoodwin.dev>
Date: Sat, 24 Dec 2022 18:30:18 -0800
Subject: [PATCH] cleanups on that PR

---
 .../denizen/events/ScriptEventRegistry.java         |  2 +-
 ...ent.java => EntityGoesIntoBlockScriptEvent.java} | 13 ++++---------
 .../denizenscript/denizen/objects/PolygonTag.java   |  3 ++-
 3 files changed, 7 insertions(+), 11 deletions(-)
 rename plugin/src/main/java/com/denizenscript/denizen/events/entity/{EntityEntersBlockScriptEvent.java => EntityGoesIntoBlockScriptEvent.java} (83%)

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java b/plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java
index 74c5d042fb..3f5b8dc652 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java
@@ -106,7 +106,6 @@ public static void registerMainEvents() {
         ScriptEvent.registerScriptEvent(EntityDeathScriptEvent.class);
         ScriptEvent.registerScriptEvent(EntityDespawnScriptEvent.class);
         ScriptEvent.registerScriptEvent(EntityDropsItemScriptEvent.class);
-        ScriptEvent.registerScriptEvent(EntityEntersBlockScriptEvent.class);
         ScriptEvent.registerScriptEvent(EntityEntersPortalScriptEvent.class);
         ScriptEvent.registerScriptEvent(EntityEntersVehicleScriptEvent.class);
         ScriptEvent.registerScriptEvent(EntityExitsPortalScriptEvent.class);
@@ -116,6 +115,7 @@ public static void registerMainEvents() {
         ScriptEvent.registerScriptEvent(EntityFoodLevelChangeScriptEvent.class);
         ScriptEvent.registerScriptEvent(EntityFormsBlockScriptEvent.class);
         ScriptEvent.registerScriptEvent(EntityGlideScriptEvent.class);
+        ScriptEvent.registerScriptEvent(EntityGoesIntoBlockScriptEvent.class);
         ScriptEvent.registerScriptEvent(EntityHealsScriptEvent.class);
         ScriptEvent.registerScriptEvent(EntityInteractScriptEvent.class);
         ScriptEvent.registerScriptEvent(EntityKilledScriptEvent.class);
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityGoesIntoBlockScriptEvent.java
similarity index 83%
rename from plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersBlockScriptEvent.java
rename to plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityGoesIntoBlockScriptEvent.java
index 20a6b7777d..51f0799b00 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersBlockScriptEvent.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityGoesIntoBlockScriptEvent.java
@@ -11,7 +11,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityEnterBlockEvent;
 
-public class EntityEntersBlockScriptEvent extends BukkitScriptEvent implements Listener {
+public class EntityGoesIntoBlockScriptEvent extends BukkitScriptEvent implements Listener {
 
     // <--[event]
     // @Events
@@ -23,7 +23,7 @@ public class EntityEntersBlockScriptEvent extends BukkitScriptEvent implements L
     //
     // @Cancellable true
     //
-    // @Triggers when an entity enters, and is stored in a block (EG a bee enters a bee nest)
+    // @Triggers when an entity enters, and is stored in a block (eg a bee enters a bee nest).
     // Does not fire when a silverfish "enters" a stone block. Prefer <@link event entity changes block (into block)> for that.
     //
     // @Context
@@ -31,13 +31,9 @@ public class EntityEntersBlockScriptEvent extends BukkitScriptEvent implements L
     // <context.location> returns the LocationTag of the block entered by the entity.
     // <context.material> returns the MaterialTag of the block entered by the entity.
     //
-    // @Player when the entity that entered the block is a player
-    //
-    // @NPC when the entity that entered the block is an NPC.
-    //
     // -->
 
-    public EntityEntersBlockScriptEvent() {
+    public EntityGoesIntoBlockScriptEvent() {
         registerCouldMatcher("<entity> goes into <block>");
     }
 
@@ -48,8 +44,7 @@ public EntityEntersBlockScriptEvent() {
 
     @Override
     public boolean matches(ScriptPath path) {
-        String target = path.eventArgLowerAt(0);
-        if (!entity.tryAdvancedMatcher(target)) {
+        if (!path.tryArgObject(0, entity)) {
             return false;
         }
         if (!path.tryArgObject(3, material)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java
index ddf0bbfb5f..cbc7a61e66 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java
@@ -715,7 +715,8 @@ public static void register() {
         // @description
         // Returns a copy of the polygon, with the specified corner added to the end of the corner list.
         // @example
-        // # Notes a new polygon with a new corner added. If the new corner has a location of "10,66,-2", and "my_polygon" has corners "0.0,0.0", "7.0,7.0", and "-5.0,6.0",
+        // # Notes a new polygon with a new corner added.
+        // # If the new corner has a location of "10,66,-2", and "my_polygon" has corners "0.0,0.0", "7.0,7.0", and "-5.0,6.0",
         // # then "my_new_polygon" will have corners  "0.0,0.0", "7.0,7.0", "-5.0,6.0", and "10.0,-2.0".
         // - note <polygon[my_polygon].with_corner[10,66,-2]> as:my_new_polygon
         // -->