(deps): update game-sdk

emortalmc · Jan 5, 2024 · c9177e9 · c9177e9
1 parent 597a445
commit c9177e9
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;