zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Changed minimum required version to Spigot 1.15

Browse source
This commit is contained in:
Intelli 2022-12-15 16:45:24 -07:00
parent 12f2000085
commit 61847f2f8d
10 changed files with 52 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/net/coreprotect/utility/entity/EntityUtil.java
View file

@ -17,6 +17,7 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.entity.AbstractHorse;
import org.bukkit.entity.AbstractVillager;
import org.bukkit.entity.Ageable;
import org.bukkit.entity.Bee;
import org.bukkit.entity.Cat;
import org.bukkit.entity.ChestedHorse;
import org.bukkit.entity.Creeper;
@ -532,6 +533,21 @@ public class EntityUtil {
}
}
}
else if (entity instanceof Bee) {
Bee bee = (Bee) entity;
if (count == 0) {
int set = (int) value;
bee.setAnger(set);
}
else if (count == 1) {
boolean set = (Boolean) value;
bee.setHasNectar(set);
}
else if (count == 2) {
boolean set = (Boolean) value;
bee.setHasStung(set);
}
}
else {
BukkitAdapter.ADAPTER.setEntityMeta(entity, value, count);
}

16
src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java
View file

@ -23,6 +23,7 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.inventory.meta.MapMeta;
import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.inventory.meta.SuspiciousStewMeta;
import org.bukkit.potion.PotionEffect;
import net.coreprotect.bukkit.BukkitAdapter;
@ -232,6 +233,21 @@ public class ItemMetaHandler {
metadata.add(list);
}
}
else if (itemMeta instanceof SuspiciousStewMeta) {
SuspiciousStewMeta meta = (SuspiciousStewMeta) itemMeta;
SuspiciousStewMeta subMeta = meta.clone();
meta.clearCustomEffects();
list.add(meta.serialize());
metadata.add(list);
if (subMeta.hasCustomEffects()) {
for (PotionEffect effect : subMeta.getCustomEffects()) {
list = new ArrayList<>();
list.add(effect.serialize());
metadata.add(list);
}
}
}
else if (!BukkitAdapter.ADAPTER.getItemMeta(itemMeta, list, metadata, slot)) {
list.add(itemMeta.serialize());
metadata.add(list);