From c9177e929ea6281a00cb949ba5865b54a0913a33 Mon Sep 17 00:00:00 2001 From: Zak Shearman <34372536+ZakShearman@users.noreply.github.com> Date: Fri, 5 Jan 2024 03:04:48 +0000 Subject: [PATCH] (deps): update game-sdk --- build.gradle.kts | 2 +- .../dev/emortal/minestom/lazertag/game/LazerTagGame.java | 6 +++++- src/main/java/dev/emortal/minestom/lazertag/gun/Gun.java | 4 ++-- .../dev/emortal/minestom/lazertag/gun/guns/BeeBlaster.java | 2 +- .../dev/emortal/minestom/lazertag/gun/guns/BeeMinigun.java | 2 +- .../emortal/minestom/lazertag/gun/guns/BlockChucker.java | 4 ++-- .../java/dev/emortal/minestom/lazertag/gun/guns/RBG.java | 4 ++-- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7919951..f732008 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ repositories { } dependencies { - implementation("dev.emortal.minestom:game-sdk:5fdd697") + implementation("dev.emortal.minestom:game-sdk:a3bc80a") implementation("net.kyori:adventure-text-minimessage:4.14.0") implementation("dev.hollowcube:polar:1.3.1") diff --git a/src/main/java/dev/emortal/minestom/lazertag/game/LazerTagGame.java b/src/main/java/dev/emortal/minestom/lazertag/game/LazerTagGame.java index 657c309..b37c849 100755 --- a/src/main/java/dev/emortal/minestom/lazertag/game/LazerTagGame.java +++ b/src/main/java/dev/emortal/minestom/lazertag/game/LazerTagGame.java @@ -98,7 +98,11 @@ private void spawnDummyBot() { } @Override - public @NotNull Instance getSpawningInstance() { + public @NotNull Instance getSpawningInstance(@NotNull Player player) { + return this.map.instance(); + } + + public @NotNull Instance getInstance() { return this.map.instance(); } diff --git a/src/main/java/dev/emortal/minestom/lazertag/gun/Gun.java b/src/main/java/dev/emortal/minestom/lazertag/gun/Gun.java index 1e5e252..3f06030 100755 --- a/src/main/java/dev/emortal/minestom/lazertag/gun/Gun.java +++ b/src/main/java/dev/emortal/minestom/lazertag/gun/Gun.java @@ -49,7 +49,7 @@ public void shoot(@NotNull Player shooter, int ammo) { Vec shootDir = spread(shooter.getPosition().direction(), this.itemInfo.spread()); Pos eyePos = shooter.getPosition().add(0, shooter.getEyeHeight(), 0); - RaycastResult raycast = RaycastUtil.raycast(this.game.getSpawningInstance(), eyePos, shootDir, this.itemInfo.distance(), + RaycastResult raycast = RaycastUtil.raycast(this.game.getInstance(), eyePos, shootDir, this.itemInfo.distance(), entity -> entity != shooter && entity instanceof Player player && player.getGameMode() == GameMode.ADVENTURE); Point hitPoint = raycast.hitPosition() == null ? eyePos.add(shootDir.mul(this.itemInfo.distance())) : raycast.hitPosition(); @@ -59,7 +59,7 @@ public void shoot(@NotNull Player shooter, int ammo) { // TODO: hit block animation } - ParticleUtil.renderBulletTrail(this.game.getSpawningInstance(), eyePos.add(shootDir.mul(2.0)), hitPoint, 1.5); + ParticleUtil.renderBulletTrail(this.game.getInstance(), eyePos.add(shootDir.mul(2.0)), hitPoint, 1.5); } } diff --git a/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BeeBlaster.java b/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BeeBlaster.java index 92d4491..1e43702 100755 --- a/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BeeBlaster.java +++ b/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BeeBlaster.java @@ -51,7 +51,7 @@ public void shoot(@NotNull Player shooter, int ammo) { Pos spawnPos = shooter.getPosition().add(0, shooter.getEyeHeight() - EntityType.BEE.height() / 2, 0) .add(shooter.getPosition().direction().mul(1)); - entity.setInstance(this.game.getSpawningInstance(), spawnPos); + entity.setInstance(this.game.getInstance(), spawnPos); } private final class BeeBlasterEntity extends BetterEntityProjectile { diff --git a/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BeeMinigun.java b/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BeeMinigun.java index dfb2e77..f0476bb 100755 --- a/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BeeMinigun.java +++ b/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BeeMinigun.java @@ -49,7 +49,7 @@ public void shoot(@NotNull Player shooter, int ammo) { Pos spawnPos = shooter.getPosition().add(0, shooter.getEyeHeight() - EntityType.BEE.height() / 4, 0) .add(shooter.getPosition().direction().mul(1)); - entity.setInstance(this.game.getSpawningInstance(), spawnPos); + entity.setInstance(this.game.getInstance(), spawnPos); } private final class BeeBlasterEntity extends BetterEntityProjectile { diff --git a/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BlockChucker.java b/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BlockChucker.java index ea69123..d4e50c7 100755 --- a/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BlockChucker.java +++ b/src/main/java/dev/emortal/minestom/lazertag/gun/guns/BlockChucker.java @@ -59,7 +59,7 @@ public void shoot(@NotNull Player shooter, int ammo) { Pos spawnPos = shooter.getPosition().add(0, shooter.getEyeHeight() - EntityType.BEE.height() / 2, 0) .add(shooter.getPosition().direction().mul(1)); - entity.setInstance(this.game.getSpawningInstance(), spawnPos); + entity.setInstance(this.game.getInstance(), spawnPos); } private final class BlockChuckerEntity extends BetterEntityProjectile { @@ -119,7 +119,7 @@ private void collide() { ServerPacket explosionPacket = new ExplosionPacket(pos.x(), pos.y(), pos.z(), 2f, new byte[0], 0f, 0f, 0); this.sendPacketToViewers(explosionPacket); - for (Player victim : BlockChucker.this.game.getSpawningInstance().getPlayers()) { + for (Player victim : BlockChucker.this.game.getInstance().getPlayers()) { if (victim.isInvulnerable()) continue; if (victim.getDistanceSquared(this) > 5 * 5) continue; diff --git a/src/main/java/dev/emortal/minestom/lazertag/gun/guns/RBG.java b/src/main/java/dev/emortal/minestom/lazertag/gun/guns/RBG.java index 9f36927..432354d 100755 --- a/src/main/java/dev/emortal/minestom/lazertag/gun/guns/RBG.java +++ b/src/main/java/dev/emortal/minestom/lazertag/gun/guns/RBG.java @@ -49,7 +49,7 @@ public void shoot(@NotNull Player shooter, int ammo) { Pos spawnPos = shooter.getPosition().add(0, shooter.getEyeHeight() - EntityType.BEE.height() / 2, 0) .add(shooter.getPosition().direction().mul(1)); - entity.setInstance(this.game.getSpawningInstance(), spawnPos); + entity.setInstance(this.game.getInstance(), spawnPos); } private final class BeeBlasterEntity extends BetterEntityProjectile { @@ -80,7 +80,7 @@ private void collide() { this.sendPacketToViewers(explosionPacket); - for (Player victim : RBG.this.game.getSpawningInstance().getPlayers()) { + for (Player victim : RBG.this.game.getInstance().getPlayers()) { if (victim == this.shooter) continue; if (victim.isInvulnerable()) continue; if (victim.getDistanceSquared(this) > 5 * 5) continue;