Skip to content

Commit 6fe0d4b

Browse files
authored
Merge branch 'gecolay:main' into main
2 parents 3a97aa6 + 1fdec06 commit 6fe0d4b

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

core/src/main/java/dev/geco/gsit/link/PlaceholderAPILink.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ public class PlaceholderAPILink extends PlaceholderExpansion {
3535
@Override
3636
public @NotNull List<String> getPlaceholders() { return Arrays.asList("crawling", "emoting", "playertoggle", "posing", "sitting", "toggle"); }
3737

38-
// https://wiki.placeholderapi.com/developers/creating-a-placeholderexpansion/#making-an-internal-expansion
3938
@Override
4039
public boolean persist() { return true; }
41-
40+
4241
@Override
4342
public String onRequest(OfflinePlayer Player, @NotNull String Params) {
4443

@@ -57,4 +56,4 @@ public String onRequest(OfflinePlayer Player, @NotNull String Params) {
5756
return null;
5857
}
5958

60-
}
59+
}

mcv1_17/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private void buildBlock(Location Location) {
173173

174174
blockLocation = Location;
175175

176-
player.sendBlockChange(blockLocation, blockData);
176+
if(blockLocation != null) player.sendBlockChange(blockLocation, blockData);
177177
}
178178

179179
private void destoryBlock() {

mcv1_17_1/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private void buildBlock(Location Location) {
173173

174174
blockLocation = Location;
175175

176-
player.sendBlockChange(blockLocation, blockData);
176+
if(blockLocation != null) player.sendBlockChange(blockLocation, blockData);
177177
}
178178

179179
private void destoryBlock() {

mcv1_19_3/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private void buildBlock(Location Location) {
173173

174174
blockLocation = Location;
175175

176-
player.sendBlockChange(blockLocation, blockData);
176+
if(blockLocation != null) player.sendBlockChange(blockLocation, blockData);
177177
}
178178

179179
private void destoryBlock() {

mcv1_21/src/main/java/dev/geco/gsit/mcv/x/objects/GCrawl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private void buildBlock(Location Location) {
173173

174174
blockLocation = Location;
175175

176-
player.sendBlockChange(blockLocation, blockData);
176+
if(blockLocation != null) player.sendBlockChange(blockLocation, blockData);
177177
}
178178

179179
private void destoryBlock() {

0 commit comments

Comments
 (0)