Skip to content

Commit

Permalink
EntityTag#spawnAt: set entity script for falling_block too
Browse files Browse the repository at this point in the history 
also remove some old "DespawnedEntity" code that wasn't actually in use, and flatten the spawnAt method
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Jul 21, 2022
1 parent 4d2b0c9 commit 63f050a
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 155 deletions.
2 changes: 1 addition & 1 deletion ...main/java/com/denizenscript/denizen/events/player/PlayerClicksInInventoryScriptEvent.java
View file
Expand Up @@ -91,7 +91,7 @@ public class PlayerClicksInInventoryScriptEvent extends BukkitScriptEvent implem
// <context.clicked_inventory> returns the InventoryTag that was clicked in.
// <context.cursor_item> returns the item the Player is clicking with.
// <context.click> returns an ElementTag with the name of the click type. Click type list: <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/inventory/ClickType.html>
// <context.slot_type> returns an ElementTag with the name of the slot type that was clicked.
// <context.slot_type> returns an ElementTag with the name of the slot type that was clicked. Slot type list: <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/inventory/InventoryType.SlotType.html>
// <context.slot> returns an ElementTag with the number of the slot that was clicked.
// <context.raw_slot> returns an ElementTag with the raw number of the slot that was clicked.
// <context.is_shift_click> returns true if 'shift' was used while clicking.
Expand Down
239 changes: 86 additions & 153 deletions plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
View file
Expand Up @@ -515,7 +515,6 @@ public boolean isTruthy() {
public long cleanRateProtect = -60000;
public DenizenEntityType entity_type = null;
private String data1 = null;
private DespawnedEntity despawned_entity = null;
private NPCTag npc = null;
public UUID uuid = null;
private String entityScript = null;
Expand Down Expand Up @@ -818,151 +817,107 @@ public void spawnAt(Location location, TeleportCause cause) {
// If the entity is already spawned, teleport it.
if (isCitizensNPC() || (isUnique() && entity != null)) {
teleport(location, cause);
return;
}
else {
if (entity_type != null) {
if (despawned_entity != null) {
// If entity had a custom_script, use the script to rebuild the base entity.
if (despawned_entity.custom_script != null) {
// TODO: Build entity from custom script
}
// Else, use the entity_type specified/remembered
else {
entity = entity_type.spawnNewEntity(location, mechanisms, entityScript);
}
getLivingEntity().teleport(location);
getLivingEntity().getEquipment().setArmorContents(despawned_entity.equipment);
getLivingEntity().setHealth(despawned_entity.health);

despawned_entity = null;
else if (entity_type == null) {
Debug.echoError("Cannot spawn a null EntityTag!");
return;
}
if (entity_type.getBukkitEntityType() == EntityType.PLAYER && !entity_type.isCustom()) {
if (Depends.citizens == null) {
Debug.echoError("Cannot spawn entity of type PLAYER!");
return;
}
NPCTag npc = new NPCTag(net.citizensnpcs.api.CitizensAPI.getNPCRegistry().createNPC(EntityType.PLAYER, data1));
npc.getCitizen().spawn(location);
entity = npc.getEntity();
}
else if (entity_type.getBukkitEntityType() == EntityType.FALLING_BLOCK) {
MaterialTag material = null;
if (data1 != null && MaterialTag.matches(data1)) {
material = MaterialTag.valueOf(data1, CoreUtilities.basicContext);
// If we did not get a block with "RANDOM", or we got
// air or portals, keep trying
while (data1.equalsIgnoreCase("RANDOM") &&
((!material.getMaterial().isBlock()) ||
material.getMaterial() == Material.AIR ||
material.getMaterial() == Material.NETHER_PORTAL ||
material.getMaterial() == Material.END_PORTAL)) {
material = MaterialTag.valueOf(data1, CoreUtilities.basicContext);
}
else {
if (entity_type.getBukkitEntityType() == EntityType.PLAYER && !entity_type.isCustom()) {
if (Depends.citizens == null) {
Debug.echoError("Cannot spawn entity of type PLAYER!");
return;
}
else {
NPCTag npc = new NPCTag(net.citizensnpcs.api.CitizensAPI.getNPCRegistry().createNPC(EntityType.PLAYER, data1));
npc.getCitizen().spawn(location);
entity = npc.getEntity();
uuid = entity.getUniqueId();
}
}
else if (entity_type.getBukkitEntityType() == EntityType.FALLING_BLOCK) {
MaterialTag material = null;
if (data1 != null && MaterialTag.matches(data1)) {
material = MaterialTag.valueOf(data1, CoreUtilities.basicContext);
// If we did not get a block with "RANDOM", or we got
// air or portals, keep trying
while (data1.equalsIgnoreCase("RANDOM") &&
((!material.getMaterial().isBlock()) ||
material.getMaterial() == Material.AIR ||
material.getMaterial() == Material.NETHER_PORTAL ||
material.getMaterial() == Material.END_PORTAL)) {
material = MaterialTag.valueOf(data1, CoreUtilities.basicContext);
}
}
else {
for (Mechanism mech : mechanisms) {
if (mech.getName().equals("fallingblock_type")) {
material = mech.valueAsType(MaterialTag.class);
mechanisms.remove(mech);
break;
}
}
}
// If material is null or not a block, default to SAND
if (material == null || !material.getMaterial().isBlock() || !material.hasModernData()) {
material = new MaterialTag(Material.SAND);
}
// This is currently the only way to spawn a falling block
entity = location.getWorld().spawnFallingBlock(location, material.getModernData());
uuid = entity.getUniqueId();
}
else {
for (Mechanism mech : mechanisms) {
if (mech.getName().equals("fallingblock_type")) {
material = mech.valueAsType(MaterialTag.class);
mechanisms.remove(mech);
break;
}
else if (entity_type.getBukkitEntityType() == EntityType.PAINTING) {
entity = entity_type.spawnNewEntity(location, mechanisms, entityScript);
location = location.clone();
Painting painting = (Painting) entity;
Art art = null;
BlockFace face = null;
try {
for (Mechanism mech : mechanisms) {
if (mech.getName().equals("painting")) {
art = Art.valueOf(mech.getValue().asString().toUpperCase());
}
else if (mech.getName().equals("rotation")) {
face = BlockFace.valueOf(mech.getValue().asString().toUpperCase());
}
}
}
catch (Exception ex) {
// ignore
}
if (art != null && face != null) { // Paintings are the worst
if (art.getBlockHeight() % 2 == 0) {
location.subtract(0, 1, 0);
}
if (art.getBlockWidth() % 2 == 0) {
if (face == BlockFace.WEST) {
location.subtract(0, 0, 1);
}
else if (face == BlockFace.SOUTH) {
location.subtract(1, 0, 0);
}
}
painting.teleport(location);
painting.setFacingDirection(face, true);
painting.setArt(art, true);
}
}
}
// If material is null or not a block, default to SAND
if (material == null || !material.getMaterial().isBlock() || !material.hasModernData()) {
material = new MaterialTag(Material.SAND);
}
// This is currently the only way to spawn a falling block
entity = location.getWorld().spawnFallingBlock(location, material.getModernData());
}
else if (entity_type.getBukkitEntityType() == EntityType.PAINTING) {
entity = entity_type.spawnNewEntity(location, mechanisms, entityScript);
location = location.clone();
Painting painting = (Painting) entity;
Art art = null;
BlockFace face = null;
try {
for (Mechanism mech : mechanisms) {
if (mech.getName().equals("painting")) {
art = Art.valueOf(mech.getValue().asString().toUpperCase());
}
else {
entity = entity_type.spawnNewEntity(location, mechanisms, entityScript);
if (entity == null) {
if (CoreConfiguration.debugVerbose) {
Debug.echoError("Failed to spawn entity of type " + entity_type.getName());
}
return;
}
uuid = entity.getUniqueId();
if (entityScript != null) {
EntityScriptHelper.setEntityScript(entity, entityScript);
}
else if (mech.getName().equals("rotation")) {
face = BlockFace.valueOf(mech.getValue().asString().toUpperCase());
}
}
}
else {
Debug.echoError("Cannot spawn a null EntityTag!");
catch (Exception ex) {
// ignore
}
if (!isUnique()) {
if (new LocationTag(location).isChunkLoaded()) {
Debug.echoError("Error spawning entity - tried to spawn in an unloaded chunk.");
if (art != null && face != null) { // Paintings are the worst
if (art.getBlockHeight() % 2 == 0) {
location.subtract(0, 1, 0);
}
else {
Debug.echoError("Error spawning entity - bad entity type, blocked by another plugin?");
if (art.getBlockWidth() % 2 == 0) {
if (face == BlockFace.WEST) {
location.subtract(0, 0, 1);
}
else if (face == BlockFace.SOUTH) {
location.subtract(1, 0, 0);
}
}
return;
painting.teleport(location);
painting.setFacingDirection(face, true);
painting.setArt(art, true);
}
}
else {
entity = entity_type.spawnNewEntity(location, mechanisms, entityScript);
}
if (entity == null) {
if (!new LocationTag(location).isChunkLoaded()) {
Debug.echoError("Error spawning entity - tried to spawn in an unloaded chunk.");
}
for (Mechanism mechanism : mechanisms) {
safeAdjust(new Mechanism(mechanism.getName(), mechanism.value, mechanism.context));
else {
Debug.echoError("Error spawning entity - bad entity type, or blocked by another plugin?");
}
mechanisms.clear();
return;
}
}

public void despawn() {
despawned_entity = new DespawnedEntity(this);
getLivingEntity().remove();
}

public void respawn() {
if (despawned_entity != null) {
spawnAt(despawned_entity.location);
uuid = entity.getUniqueId();
if (entityScript != null) {
EntityScriptHelper.setEntityScript(entity, entityScript);
}
else if (entity == null) {
Debug.echoError("Cannot respawn a null EntityTag!");
for (Mechanism mechanism : mechanisms) {
safeAdjust(new Mechanism(mechanism.getName(), mechanism.value, mechanism.context));
}

mechanisms.clear();
}

public boolean isSpawnedOrValidForTag() {
Expand Down Expand Up @@ -1063,28 +1018,6 @@ public void setEntity(Entity entity) {
this.entity = entity;
}

// Used to store some information about a livingEntity while it's despawned
private static class DespawnedEntity {

Double health = null;
Location location = null;
ItemStack[] equipment = null;
String custom_script = null;

public DespawnedEntity(EntityTag entity) {
if (entity != null) {
// Save some important info to rebuild the entity
health = entity.getLivingEntity().getHealth();
location = entity.getLivingEntity().getLocation();
equipment = entity.getLivingEntity().getEquipment().getArmorContents();

if (CustomNBT.hasCustomNBT(entity.getLivingEntity(), "denizen-script-id")) {
custom_script = CustomNBT.getCustomNBT(entity.getLivingEntity(), "denizen-script-id");
}
}
}
}

public int comparesTo(EntityTag entity) {
// Never matches a null
if (entity == null) {
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/com/denizenscript/denizen/utilities/command/NPCCommandHandler.java
View file
Expand Up @@ -711,7 +711,7 @@ public void invisible(CommandContext args, CommandSender sender, NPC npc) throws
}

@Command(
aliases = {"npc"}, usage = "health --set # (-r)",
aliases = {"npc"}, usage = "health (--set #) (--max #) (-r)",
desc = "Sets the max health for an NPC.", modifiers = {"health", "he", "hp"},
min = 1, max = 3, permission = "denizen.npc.health", flags = "sra")
@Requirements(selected = true, ownership = true)
Expand Down

0 comments on commit 63f050a

Please sign in to comment.