Upstream/CoreProtect
1
0
Fork 0
mirror of https://github.com/PlayPro/CoreProtect.git synced 2024-11-15 10:45:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use proper adapter for EntityType.END_CRYSTAL

Browse Source
This commit is contained in:
Intelli 2024-06-18 16:04:35 -06:00
parent 49eb176ee6
commit fa1de08c0d
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/coreprotect/bukkit/BukkitAdapter.java
View File

@ -288,4 +288,14 @@ public class BukkitAdapter implements BukkitInterface {
return itemStack;
}
@Override
public EntityType getEntityType(Material material) {
switch (material) {
case END_CRYSTAL:
return EntityType.valueOf("ENDER_CRYSTAL");
default:
return EntityType.UNKNOWN;
}
}
}

2
src/main/java/net/coreprotect/bukkit/BukkitInterface.java
View File

@ -87,4 +87,6 @@ public interface BukkitInterface {
public ItemStack getArrowMeta(Arrow arrow, ItemStack itemStack);
public EntityType getEntityType(Material material);
}

11
src/main/java/net/coreprotect/bukkit/Bukkit_v1_21.java
View File

@ -2,6 +2,7 @@ package net.coreprotect.bukkit;
import org.bukkit.Material;
import org.bukkit.Tag;
import org.bukkit.entity.EntityType;
import net.coreprotect.model.BlockGroup;
@ -22,4 +23,14 @@ public class Bukkit_v1_21 extends Bukkit_v1_20 implements BukkitInterface {
}
}
@Override
public EntityType getEntityType(Material material) {
switch (material) {
case END_CRYSTAL:
return EntityType.valueOf("END_CRYSTAL");
default:
return EntityType.UNKNOWN;
}
}
}

9
src/main/java/net/coreprotect/database/rollback/Rollback.java
View File

@ -649,14 +649,7 @@ public class Rollback extends RollbackUtil {
}
if (!exists) {
EntityType END_CRYSTAL = null;
try {
END_CRYSTAL = EntityType.valueOf("END_CRYSTAL"); // 1.21+
}
catch (Exception e) {
END_CRYSTAL = EntityType.valueOf("ENDER_CRYSTAL"); // <= 1.20
}
Entity entity = block.getLocation().getWorld().spawnEntity(location1, END_CRYSTAL);
Entity entity = block.getLocation().getWorld().spawnEntity(location1, BukkitAdapter.ADAPTER.getEntityType(Material.END_CRYSTAL));
EnderCrystal enderCrystal = (EnderCrystal) entity;
enderCrystal.setShowingBottom((rowData != 0));
PaperAdapter.ADAPTER.teleportAsync(entity, location1);