Merge branch 'gecolay:main' into main

Winds-Studio · Jul 19, 2024 · 6fe0d4b · 6fe0d4b
2 parents 3a97aa6 + 1fdec06
commit 6fe0d4b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/core/src/main/java/dev/geco/gsit/link/PlaceholderAPILink.java b/core/src/main/java/dev/geco/gsit/link/PlaceholderAPILink.java
@@ -35,10 +35,9 @@ public class PlaceholderAPILink extends PlaceholderExpansion {
     @Override
     public @NotNull List<String> getPlaceholders() { return Arrays.asList("crawling", "emoting", "playertoggle", "posing", "sitting", "toggle"); }
 
-    // https://wiki.placeholderapi.com/developers/creating-a-placeholderexpansion/#making-an-internal-expansion
     @Override
     public boolean persist() { return true; }
-    
+
     @Override
     public String onRequest(OfflinePlayer Player, @NotNull String Params) {
 
@@ -57,4 +56,4 @@ public String onRequest(OfflinePlayer Player, @NotNull String Params) {
         return null;
     }
 
-}
+}
diff --git a/mcv1_17/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java b/mcv1_17/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java
@@ -173,7 +173,7 @@ private void buildBlock(Location Location) {
 
         blockLocation = Location;
 
-        player.sendBlockChange(blockLocation, blockData);
+        if(blockLocation != null) player.sendBlockChange(blockLocation, blockData);
     }
 
     private void destoryBlock() {

diff --git a/mcv1_17_1/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java b/mcv1_17_1/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java
@@ -173,7 +173,7 @@ private void buildBlock(Location Location) {
 
         blockLocation = Location;
 
-        player.sendBlockChange(blockLocation, blockData);
+        if(blockLocation != null) player.sendBlockChange(blockLocation, blockData);
     }
 
     private void destoryBlock() {

diff --git a/mcv1_19_3/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java b/mcv1_19_3/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java
@@ -173,7 +173,7 @@ private void buildBlock(Location Location) {
 
         blockLocation = Location;
 
-        player.sendBlockChange(blockLocation, blockData);
+        if(blockLocation != null) player.sendBlockChange(blockLocation, blockData);
     }
 
     private void destoryBlock() {

diff --git a/mcv1_21/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java b/mcv1_21/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java
@@ -173,7 +173,7 @@ private void buildBlock(Location Location) {
 
         blockLocation = Location;
 
-        player.sendBlockChange(blockLocation, blockData);
+        if(blockLocation != null) player.sendBlockChange(blockLocation, blockData);
     }
 
     private void destoryBlock() {