SteamWar/SpigotCore
Archiviert
13
0

fix missmatched index throughout versions
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed

Dieser Commit ist enthalten in:
zOnlyKroks 2023-01-17 16:14:38 +01:00
Ursprung da9718c69c
Commit fb47db67de
2 geänderte Dateien mit 20 neuen und 3 gelöschten Zeilen

Datei anzeigen

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

Datei anzeigen

@ -70,7 +70,11 @@ public class REntity {
private String displayName;
protected final Map<Object, ItemStack> itemSlots;
public REntity(REntityServer server, EntityType entityType, Location location,int objectData) {
public REntity(REntityServer server, EntityType entityType, Location location) {
this(server, entityType, new UUID(random.nextLong() & -61441L | 16384L, random.nextLong() & 4611686018427387903L | -9223372036854775808L), location,0);
}
protected REntity(REntityServer server, EntityType entityType, Location location,int objectData) {
this(server, entityType, new UUID(random.nextLong() & -61441L | 16384L, random.nextLong() & 4611686018427387903L | -9223372036854775808L), location,objectData);
}
@ -373,7 +377,20 @@ public class REntity {
protected static Function<REntity, Object> spawnPacketGenerator(Class<?> spawnPacket, int posOffset) {
Reflection.FieldAccessor<Integer> entityId = Reflection.getField(spawnPacket, int.class, 0);
Reflection.FieldAccessor<Integer> additionalData = Reflection.getField(spawnPacket, int.class, 9);
//Core version 8, index = 10
//Core version 9 to 18, index = 6
//Core version 19, index = 7
int index;
switch (Core.getVersion()) {
case 8: index = 10;
case 19: index = 7;
default: index = 6;
}
Reflection.FieldAccessor<Integer> additionalData = Reflection.getField(spawnPacket, int.class, index);
BountifulWrapper.PositionSetter position = BountifulWrapper.impl.getPositionSetter(spawnPacket, posOffset);
return entity -> {