mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-11-01 04:37:09 +00:00
32 lines
1.6 KiB
Diff
32 lines
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Video <videogamesm12@gmail.com>
|
||
|
|
Date: Sun, 13 Mar 2022 03:01:29 -0600
|
||
|
|
Subject: [PATCH] Fixes the Blank SkullOwner exploit
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
||
|
|
index 7cacc61fed0c610845c67894d1cc68e44f5e46fe..4186b9558cbf6799e8491443b9ed5a2c9063ab7c 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
||
|
|
@@ -6,6 +6,9 @@ import java.util.Map;
|
||
|
|
import java.util.UUID;
|
||
|
|
import com.destroystokyo.paper.profile.CraftPlayerProfile;
|
||
|
|
import com.destroystokyo.paper.profile.PlayerProfile;
|
||
|
|
+// Scissors start
|
||
|
|
+import org.apache.commons.lang3.StringUtils;
|
||
|
|
+// Scissors end
|
||
|
|
import org.bukkit.Bukkit;
|
||
|
|
import org.bukkit.Material;
|
||
|
|
import org.bukkit.OfflinePlayer;
|
||
|
|
@@ -47,7 +50,9 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
|
||
|
|
|
||
|
|
if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) {
|
||
|
|
this.setProfile(NbtUtils.readGameProfile(tag.getCompound(SKULL_OWNER.NBT)));
|
||
|
|
- } else if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_STRING) && !tag.getString(SKULL_OWNER.NBT).isEmpty()) {
|
||
|
|
+ // Scissors start
|
||
|
|
+ } else if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_STRING) && !StringUtils.isBlank(tag.getString(SKULL_OWNER.NBT))) {
|
||
|
|
+ // Scissors end
|
||
|
|
this.setProfile(new GameProfile(null, tag.getString(SKULL_OWNER.NBT)));
|
||
|
|
}
|
||
|
|
}
|