SteamWar/BauSystem2.0
Archiviert
12
0

Fix 1.19.1
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Dieser Commit ist enthalten in:
Lixfel 2022-08-05 08:26:27 +02:00
Ursprung 88aa07ccb2
Commit 4a3d806bf4
6 geänderte Dateien mit 24 neuen und 24 gelöschten Zeilen

Datei anzeigen

@ -89,7 +89,7 @@ public class DetonatorEntity19 extends EntityFallingBlock implements AbstractDet
if (references++ > 0) if (references++ > 0)
return; return;
PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), cp(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.E, Block.i(iBlockData), ZERO, 0.0); PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), co(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.E, Block.i(iBlockData), ZERO, 0.0);
PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b; PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
playerConnection.a(packetPlayOutSpawnEntity); playerConnection.a(packetPlayOutSpawnEntity);

Datei anzeigen

@ -142,9 +142,9 @@ public class FakeExplosion19 extends Explosion {
if (!entity.cF()) { if (!entity.cF()) {
double d7 = Math.sqrt(entity.e(vec3d)) / (double) f2; double d7 = Math.sqrt(entity.e(vec3d)) / (double) f2;
if (d7 <= 1.0D) { if (d7 <= 1.0D) {
double d8 = entity.dg() - this.g; double d8 = entity.df() - this.g;
double d9 = entity.di() - this.h; double d9 = entity.dh() - this.h;
double d10 = entity.dm() - this.i; double d10 = entity.dl() - this.i;
double d11 = Math.sqrt(d8 * d8 + d9 * d9 + d10 * d10); double d11 = Math.sqrt(d8 * d8 + d9 * d9 + d10 * d10);
if (d11 != 0.0D) { if (d11 != 0.0D) {
d8 /= d11; d8 /= d11;
@ -155,7 +155,7 @@ public class FakeExplosion19 extends Explosion {
double d13 = (1.0D - d7) * d12; double d13 = (1.0D - d7) * d12;
entity.lastDamageCancelled = false; entity.lastDamageCancelled = false;
CraftEventFactory.entityDamage = null; CraftEventFactory.entityDamage = null;
entity.f(entity.de().b(d8 * d13, d9 * d13, d10 * d13)); entity.f(entity.dd().b(d8 * d13, d9 * d13, d10 * d13));
} }
} }
} }

Datei anzeigen

@ -85,7 +85,7 @@ public class FakeTNT19 extends EntityTNTPrimed {
} }
public boolean bl() { public boolean bl() {
return !this.du(); return !this.dt();
} }
private Vec3D g(Vec3D vec3d) { private Vec3D g(Vec3D vec3d) {
@ -125,7 +125,7 @@ public class FakeTNT19 extends EntityTNTPrimed {
Vec3D vec3d1 = this.g(vec3d); Vec3D vec3d1 = this.g(vec3d);
double d0 = vec3d1.g(); double d0 = vec3d1.g();
if (d0 > 1.0E-7) { if (d0 > 1.0E-7) {
this.e(this.dg() + vec3d1.c, this.di() + vec3d1.d, this.dm() + vec3d1.e); this.e(this.df() + vec3d1.c, this.dg() + vec3d1.d, this.dl() + vec3d1.e);
} }
boolean flag = !MathHelper.b(vec3d.c, vec3d1.c); boolean flag = !MathHelper.b(vec3d.c, vec3d1.c);
@ -143,9 +143,9 @@ public class FakeTNT19 extends EntityTNTPrimed {
BlockPosition blockposition = this.aA(); BlockPosition blockposition = this.aA();
IBlockData iblockdata = this.s.a_(blockposition); IBlockData iblockdata = this.s.a_(blockposition);
// this.a(vec3d1.d, this.y, iblockdata, blockposition); // this.a(vec3d1.d, this.y, iblockdata, blockposition);
if (!this.du()) { if (!this.dt()) {
if (this.z) { if (this.z) {
Vec3D vec3d2 = this.de(); Vec3D vec3d2 = this.dd();
this.n(flag ? 0.0 : vec3d2.c, vec3d2.d, flag1 ? 0.0 : vec3d2.e); this.n(flag ? 0.0 : vec3d2.c, vec3d2.d, flag1 ? 0.0 : vec3d2.e);
} }
@ -160,19 +160,19 @@ public class FakeTNT19 extends EntityTNTPrimed {
this.ax(); this.ax();
float f2 = this.aD(); float f2 = this.aD();
this.f(this.de().d((double)f2, 1.0, (double)f2)); this.f(this.dd().d((double)f2, 1.0, (double)f2));
} }
} }
public void k(List<FakeTNT19> spawnList) { public void k(List<FakeTNT19> spawnList) {
if (!this.aN()) { if (!this.aN()) {
this.f(this.de().b(0.0D, -0.04D, 0.0D)); this.f(this.dd().b(0.0D, -0.04D, 0.0D));
} }
this.a(EnumMoveType.a, this.de()); this.a(EnumMoveType.a, this.dd());
this.f(this.de().a(0.98D)); this.f(this.dd().a(0.98D));
if (super.y) { if (super.y) {
this.f(this.de().d(0.7D, -0.5D, 0.7D)); this.f(this.dd().d(0.7D, -0.5D, 0.7D));
} }
int i = this.i() - 1; int i = this.i() - 1;
@ -184,14 +184,14 @@ public class FakeTNT19 extends EntityTNTPrimed {
this.ah(); this.ah();
} else { } else {
this.aZ(); this.aY();
} }
if (i == 1 && count > 1) { if (i == 1 && count > 1) {
for (int c = 0; c < count - 1; c++) { for (int c = 0; c < count - 1; c++) {
FakeTNT19 fakeTNT19 = new FakeTNT19(fakeTNT19s, this.s, this.dg(), this.di(), this.dm(), i, 1); FakeTNT19 fakeTNT19 = new FakeTNT19(fakeTNT19s, this.s, this.df(), this.dh(), this.dl(), i, 1);
fakeTNT19.y = this.y; fakeTNT19.y = this.y;
fakeTNT19.f(new Vec3D(this.de().c, this.de().d, this.de().e)); fakeTNT19.f(new Vec3D(this.dd().c, this.dd().d, this.dd().e));
spawnList.add(fakeTNT19); spawnList.add(fakeTNT19);
} }
count = 1; count = 1;
@ -202,7 +202,7 @@ public class FakeTNT19 extends EntityTNTPrimed {
ExplosionPrimeEvent event = new ExplosionPrimeEvent((Explosive) this.getBukkitEntity()); ExplosionPrimeEvent event = new ExplosionPrimeEvent((Explosive) this.getBukkitEntity());
super.s.getCraftServer().getPluginManager().callEvent(event); super.s.getCraftServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
this.a(this, this.dg(), this.e(0.0625D), this.dm(), event.getRadius(), event.getFire(), Explosion.Effect.b); this.a(this, this.df(), this.e(0.0625D), this.dl(), event.getRadius(), event.getFire(), Explosion.Effect.b);
} }
} }
@ -247,8 +247,8 @@ public class FakeTNT19 extends EntityTNTPrimed {
return new PacketPlayOutSpawnEntity(this); return new PacketPlayOutSpawnEntity(this);
} }
public boolean cs() { public boolean cr() {
return super.cs(); return super.cr();
} }
static { static {

Datei anzeigen

@ -47,7 +47,7 @@ public class BaseArmorStand19 extends EntityArmorStand implements AbstractEntity
} }
public void sendEntity(Player player) { public void sendEntity(Player player) {
PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), cp(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.d, 0, ZERO, 0.0); PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), co(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.d, 0, ZERO, 0.0);
PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b; PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
playerConnection.a(packetPlayOutSpawnEntity); playerConnection.a(packetPlayOutSpawnEntity);

Datei anzeigen

@ -79,7 +79,7 @@ public class BaseEntity19 extends EntityFallingBlock implements AbstractEntity {
} }
public void sendEntity(Player player) { public void sendEntity(Player player) {
PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), cp(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.E, Block.i(iBlockData), ZERO, 0.0); PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), co(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.E, Block.i(iBlockData), ZERO, 0.0);
PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b; PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
playerConnection.a(packetPlayOutSpawnEntity); playerConnection.a(packetPlayOutSpawnEntity);

Datei anzeigen

@ -116,8 +116,8 @@ public class NMSWrapper19 implements NMSWrapper.INMSWrapper {
@Override @Override
public void setPlayerBuildAbilities(Player player) { public void setPlayerBuildAbilities(Player player) {
((CraftPlayer) player).getHandle().fC().d = true; ((CraftPlayer) player).getHandle().fB().d = true;
((CraftPlayer) player).getHandle().fC().e = true; ((CraftPlayer) player).getHandle().fB().e = true;
} }
@Override @Override