SteamWar/SpigotCore
Archiviert
13
0

Fix REntity initialization
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Dieser Commit ist enthalten in:
Lixfel 2023-02-21 10:15:52 +01:00
Ursprung be593a7d94
Commit 4f24fe862d
4 geänderte Dateien mit 5 neuen und 4 gelöschten Zeilen

Datei anzeigen

@ -52,8 +52,9 @@ public class RArmorStand extends REntity {
private final Size size; private final Size size;
public RArmorStand(REntityServer server, Location location, Size size) { public RArmorStand(REntityServer server, Location location, Size size) {
super(server, EntityType.ARMOR_STAND, location); super(server, EntityType.ARMOR_STAND, location, 0);
this.size = size; this.size = size;
server.addEntity(this);
} }
@Override @Override

Datei anzeigen

@ -30,7 +30,6 @@ import lombok.Getter;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;
import java.util.*; import java.util.*;
import java.util.function.Consumer; import java.util.function.Consumer;
@ -77,6 +76,7 @@ public class REntity {
public REntity(REntityServer server, EntityType entityType, Location location) { public REntity(REntityServer server, EntityType entityType, Location location) {
this(server,entityType,location,0); this(server,entityType,location,0);
server.addEntity(this);
} }
protected REntity(REntityServer server, EntityType entityType, Location location,int objectData) { protected REntity(REntityServer server, EntityType entityType, Location location,int objectData) {
@ -101,8 +101,6 @@ public class REntity {
this.isGlowing = false; this.isGlowing = false;
this.objectData = objectData; this.objectData = objectData;
server.addEntity(this);
} }
public void move(Location location) { public void move(Location location) {

Datei anzeigen

@ -29,5 +29,6 @@ public class RFallingBlockEntity extends REntity{
public RFallingBlockEntity(REntityServer server, Location location, Material material) { public RFallingBlockEntity(REntityServer server, Location location, Material material) {
super(server, EntityType.FALLING_BLOCK, location, BlockIds.impl.materialToId(material) >> (Core.getVersion() <= 12 ? 4 : 0)); super(server, EntityType.FALLING_BLOCK, location, BlockIds.impl.materialToId(material) >> (Core.getVersion() <= 12 ? 4 : 0));
server.addEntity(this);
} }
} }

Datei anzeigen

@ -79,6 +79,7 @@ public class RPlayer extends REntity {
super(server, EntityType.PLAYER, uuid, location,0); super(server, EntityType.PLAYER, uuid, location,0);
this.name = name; this.name = name;
//team.addEntry(name); //team.addEntry(name);
server.addEntity(this);
} }
@Override @Override