いろいろ

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/database/SqLiteDatabase.java

@@ -333,7 +333,7 @@ public void updatePitPreferences(PitPreferences pitPreferences) {
                 UPDATE `%pit_preferences%`
                 SET `preferences` = ?
                 """))) {
-            statement.setBytes(2, plugin.getGson().toJson(pitPreferences).getBytes(StandardCharsets.UTF_8));
+            statement.setBytes(1, plugin.getGson().toJson(pitPreferences).getBytes(StandardCharsets.UTF_8));
             statement.executeUpdate();
         } catch (SQLException e) {
             getLogger().log(Level.SEVERE, "Failed to update preferences in table", e);

src/main/java/com/github/elic0de/thejpspit/listener/EventListener.java

@@ -8,6 +8,7 @@
 import java.util.Optional;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -49,7 +50,11 @@ public void onJoin(PlayerJoinEvent event) {
         Object packet = packetManager.buildScoreboardTeam(player);
         packetManager.sendPacket(packet, player);
 
-        plugin.getPitPreferences().ifPresent(pitPreferences -> player.teleport(pitPreferences.getSpawn().orElse(player.getLocation())));
+        /*plugin.getPitPreferences().ifPresent(pitPreferences -> {
+            final Location location = pitPreferences.getSpawn().get();
+
+            if (location != null) player.teleport(location);
+        });*/
         if (userData.isEmpty()) {
             plugin.getDatabase().createPitPlayer(player);
             PitPlayerManager.registerUser(new PitPlayer(player));
@@ -163,6 +168,8 @@ public void onXpGain(PlayerExpChangeEvent event) {
 
     @EventHandler
     public void on(PlayerInteractEvent event) {
+        /*final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(event.getPlayer());
+        pitPlayer.increaseStreaks();*/
         if (event.getHand() != EquipmentSlot.HAND) {
             return;
         }

src/main/java/com/github/elic0de/thejpspit/nms/PacketManager.java

@@ -81,6 +81,9 @@ public interface PacketManager {
     @NotNull
     Object buildScoreboardTeam(@NotNull Player player) throws IllegalArgumentException;
 
+    @NotNull
+    Object buildTeleportPacket(@NotNull Object entity, Location loc) throws IllegalArgumentException;
+
     /**
      * Queues a new packet in the packet queue of a player.
      * This method will not flush the packet queue, the passed packet will hence be published to the player in the next

src/main/java/com/github/elic0de/thejpspit/nms/PacketManager1_19_R1.java

@@ -4,14 +4,17 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy;
 import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
+import net.minecraft.network.protocol.game.PacketPlayOutEntityTeleport;
 import net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam;
 import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
 import net.minecraft.network.syncher.DataWatcher;
 import net.minecraft.server.level.WorldServer;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityLiving;
 import net.minecraft.world.entity.decoration.EntityArmorStand;
 import net.minecraft.world.scores.Scoreboard;
@@ -106,14 +109,15 @@ public Object buildScoreboardTeam(Player player) {
             sc.setAccessible(true);
             collisionRule.setAccessible(true);
             collisionRule.set(packetPlayOutScoreTeamB, "never");
-            return sc.newInstance("", 0, Optional.of(packetPlayOutScoreTeamB), Arrays.asList(player.getName()));
+            return sc.newInstance("", 0, Optional.of(packetPlayOutScoreTeamB),
+                List.of(player.getName()));
         } catch (final ReflectiveOperationException e) {
             throw new NMSAccessException("Failed to create entity metadata packet", e);
         }
     }
 
     private Constructor<?> getConstructor(Class<?> clazz, int numParams) {
-        return Arrays.stream((Constructor[])clazz.getDeclaredConstructors()).filter(constructor -> (constructor.getParameterCount() == numParams)).findFirst().orElse(null);
+        return Arrays.stream(clazz.getDeclaredConstructors()).filter(constructor -> (constructor.getParameterCount() == numParams)).findFirst().orElse(null);
     }
 
     @NotNull
@@ -156,12 +160,24 @@ public Object buildEntityArmorStand(@NotNull Location location, @NotNull String
             armorStand.setCustomNameVisible(true);
             armorStand.setCustomName(name);
 
+
             return entityArmorStand;
         } catch (final ReflectiveOperationException e) {
             throw new NMSAccessException("Failed to create new entity armor stand", e);
         }
     }
 
+    public Object buildTeleportPacket(@NotNull Object entity, Location loc) {
+        try {
+            final ArmorStand armorStand = (ArmorStand) this.entityGetBukkitEntityMethod.invoke(entity);
+            armorStand.teleport(loc);
+
+            return new PacketPlayOutEntityTeleport((Entity) entity);
+        } catch (final ReflectiveOperationException e) {
+            throw new NMSAccessException("Failed to create new entity armor stand", e);
+        }
+    }
+
     @Override
     public void sendPacket(@NotNull Object packet, @NotNull Player player) {
         try {

src/main/java/com/github/elic0de/thejpspit/task/GameTask.java

@@ -3,11 +3,13 @@
 import com.github.elic0de.thejpspit.TheJpsPit;
 import com.github.elic0de.thejpspit.nms.PacketManager;
 import com.github.elic0de.thejpspit.player.PitPlayer;
+import de.themoep.minedown.MineDown;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -57,8 +59,6 @@ public void run() {
                             if (nearbyEntity instanceof Player) packetRecipients.add((Player) nearbyEntity);
                     }
 
-                    final Location finalSpawnLocation = spawnLocation;
-
                     // Queue packet sending.
                     pit.getServer().getScheduler().runTaskAsynchronously(pit,
                         () -> {
@@ -68,37 +68,18 @@ public void run() {
                                 100 * streaks,
                                 packetRecipients
                             );
-                            summonAndQueueBountyDeletion(
-                                TheJpsPit.getInstance().getPacketManager(),
-                                player.getLocation().add(random.nextDouble(0, 2) - 1d, random.nextDouble(0, 2), random.nextDouble(0, 2) - 1d),
-                                100 * streaks,
-                                packetRecipients
-                            );
-                            summonAndQueueBountyDeletion(
-                                TheJpsPit.getInstance().getPacketManager(),
-                                player.getLocation().add(random.nextDouble(0, 2) - 1d, random.nextDouble(0, 2), random.nextDouble(0, 2) - 1d),
-                                100 * streaks,
-                                packetRecipients
-                            );
-                            summonAndQueueBountyDeletion(
-                                TheJpsPit.getInstance().getPacketManager(),
-                                player.getLocation().add(random.nextDouble(0, 2) - 1d, random.nextDouble(0, 2), random.nextDouble(0, 2) - 1d),
-                                100 * streaks,
-                                packetRecipients
-                            );
                         }
                     );
                 }
             }
-        }.runTaskTimer(pit, 0, 20);
+        }.runTaskTimer(pit, 0, 5);
     }
 
     private void summonAndQueueBountyDeletion(PacketManager packetManager, Location location,
         long cost, List<Player> packetRecipients) {
 
         //Create the entity
-        final Object indicatorEntity = packetManager.buildEntityArmorStand(location,
-            String.valueOf(cost));
+        final Object indicatorEntity = packetManager.buildEntityArmorStand(location, ChatColor.GOLD + "" +cost);
 
         //Create the packets
         final Object entitySpawnPacket = packetManager.buildEntitySpawnPacket(indicatorEntity);
@@ -110,13 +91,36 @@ private void summonAndQueueBountyDeletion(PacketManager packetManager, Location
             packetManager.sendPacket(entityMetadataPacket, recipient);
         }
 
-        pit.getServer().getScheduler().runTaskLaterAsynchronously(pit, () -> {
+        final double startY = location.getY();
+        final double speed = 0.15;
+        final int[] tick = {0};
+        final double[] dy = new double[1];
+        final double duration = 10;
+
+        pit.getServer().getScheduler().runTaskTimerAsynchronously(pit, runnable -> {
             //Create the destroy packet
+
             final Object entityDestroyPacket = packetManager.buildEntityDestroyPacket(indicatorEntity);
+            dy[0] = 1;
+
+            location.setY(startY + dy[0]);
+            final Object teleportPacket = packetManager.buildTeleportPacket(indicatorEntity, location);
+            for (final Player recipient : packetRecipients) {
+                packetManager.sendPacket(teleportPacket, recipient);
+            }
+            dy[0] += speed;
+
+            tick[0]++;
+            if (tick[0] > duration) {
+                //Send the destroy packet
+                for (final Player recipient : packetRecipients) {
+                    //packetManager.sendPacket(teleportPacket, recipient);
+                    packetManager.sendPacket(entityDestroyPacket, recipient);
+                }
+                runnable.cancel();
+            }
 
-            //Send the destroy packet
-            for (final Player recipient : packetRecipients) packetManager.sendPacket(entityDestroyPacket, recipient);
-        }, (long) (.5 * 20));
+        }, 0, 1);
     }