fix tnt spoil feature

Author: andrei1058

server_platform/server_platform_paper/server_platform_paper_v1_21_R1/src/main/java/dev/andrei1058/bedwars/platform/paper/v1_21_R1_NMS.java

@@ -18,6 +18,7 @@
 import net.minecraft.world.phys.Vec3D;
 import org.bukkit.command.Command;
 import org.bukkit.craftbukkit.v1_21_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_21_R1.CraftWorld;
 import org.bukkit.craftbukkit.v1_21_R1.entity.CraftFireball;
 import org.bukkit.craftbukkit.v1_21_R1.entity.CraftLivingEntity;
 import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
@@ -31,7 +32,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -40,6 +40,8 @@
 public class v1_21_R1_NMS extends AbstractVerImplCmn1
 {
 
+    private ClientboundPlayerInfoUpdatePacket.a ADD_PLAYER_ACTION = null;
+
     public v1_21_R1_NMS(Plugin plugin, String name) {
         super(plugin, name);
     }
@@ -56,23 +58,17 @@ public boolean isBukkitCommandRegistered(String name) {
 
     @Override
     public void setSource(TNTPrimed tnt, Player owner) {
-        //todo tested does not work 05-09-2024 https://github.com/andrei1058/BedWars1058/issues/1040
         EntityLiving nmsEntityLiving = (((CraftLivingEntity) owner).getHandle());
         EntityTNTPrimed nmsTNT = (((CraftTNTPrimed) tnt).getHandle());
-        try {
-            Field sourceField = EntityTNTPrimed.class.getDeclaredField("d");
-            sourceField.setAccessible(true);
-            sourceField.set(nmsTNT, nmsEntityLiving);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
+        nmsTNT.h = nmsEntityLiving;
     }
 
     @Override
     public ClientboundPlayerInfoUpdatePacket getAddPlayer(EntityPlayer player) {
-        // todo cache this in production
-        ClientboundPlayerInfoUpdatePacket.a action = (ClientboundPlayerInfoUpdatePacket.a) getPlayerSpawnAction("a");
-        return new ClientboundPlayerInfoUpdatePacket(action, player);
+        if (null == ADD_PLAYER_ACTION) {
+            ADD_PLAYER_ACTION = (ClientboundPlayerInfoUpdatePacket.a) getPlayerSpawnAction("ADD_PLAYER");
+        }
+        return new ClientboundPlayerInfoUpdatePacket(ADD_PLAYER_ACTION, player);
     }
 
     @Override
@@ -119,9 +115,10 @@ public boolean isProjectile(org.bukkit.inventory.ItemStack itemStack) {
 
     @Override
     public void voidKill(Player p) {
-        //todo
-//        EntityPlayer player = getPlayer(p);
-//        player.a(player.dM().m(), 1000);
+        EntityPlayer player = getPlayer(p);
+        // out of world
+        var damageSource = ((CraftWorld)p.getWorld()).getHandle().aj().m();
+        player.a(damageSource, 1000);
     }
     @Override
     public void showArmor(@NotNull Player victim, Player receiver) {
@@ -142,17 +139,13 @@ public String getMainLevel() {
 
     @Override
     public int getVersion() {
-        return 21;
+        return 25;
     }
 
 
     @Override
     public Fireball setFireballDirection(Fireball fireball, @NotNull Vector vector) {
         EntityFireball fb = ((CraftFireball) fireball).getHandle();
-//        fb.b = vector.getX() * 0.1D;
-//        fb.c = vector.getY() * 0.1D;
-//        fb.d = vector.getZ() * 0.1D;
-        // todo experimental
         fb.a(new Vec3D(vector.getX(), vector.getY(), vector.getZ()), 0.1D);
         return (Fireball) fb.getBukkitEntity();
     }
@@ -187,17 +180,17 @@ public EntityPlayer getPlayer(Player player) {
     }
 
     public void sendPacket(Player player, Packet<?> packet) {
-        ((CraftPlayer) player).getHandle().c.a(packet);
+        ((CraftPlayer) player).getHandle().c.b(packet);
     }
 
     public void sendPackets(Player player, Packet<?> @NotNull ... packets) {
         PlayerConnection connection = ((CraftPlayer) player).getHandle().c;
         for (Packet<?> p : packets) {
-            connection.a(p);
+            connection.b(p);
         }
     }
 
-    private static Object getPlayerSpawnAction(String action) {
+    private Object getPlayerSpawnAction(@SuppressWarnings("SameParameterValue") String action) {
         try {
             Class<?> cls = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$a");
             for (Object obj : cls.getEnumConstants()) {
@@ -208,11 +201,11 @@ private static Object getPlayerSpawnAction(String action) {
                         return obj;
                     }
                 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
-                    System.out.println("could not find enum");
+                    getPlugin().getLogger().warning("Could not get player spawn action: " + action);
                 }
             }
         } catch (Exception exception) {
-            exception.printStackTrace();
+            getPlugin().getLogger().warning("Could not get player spawn action: " + action);
         }
         throw new RuntimeException("Something went wrong... please report this to BedWars1058 by andrei1058");
     }

versionsupport_nms_cmn1/src/main/java/dev/andrei1058/mc/bedwars/AbstractVerImplCmn1.java

@@ -76,8 +76,6 @@ public void registerVersionListeners() {
     public String getTag(org.bukkit.inventory.ItemStack itemStack, String key) {
         var tag = getDataContainer(itemStack);
         if (null == tag) {
-            // todo testing only
-            Bukkit.getConsoleSender().sendMessage(ChatColor.RED+"Container is null for: "+itemStack.toString());
             return null;
         }
         return tag.get(
@@ -622,13 +620,8 @@ public void spigotHidePlayer(Player victim, @NotNull Player receiver) {
 
     @Override
     public void playRedStoneDot(@NotNull Player player) {
-        Color color = Color.RED;
         PacketPlayOutWorldParticles particlePacket = new PacketPlayOutWorldParticles(
-                new ParticleParamRedstone(
-                        new Vector3f((float) color.getRed(),
-                                (float) color.getGreen(),
-                                (float) color.getBlue()), (float) 1
-                ),
+                ParticleParamRedstone.b,
                 true,
                 player.getLocation().getX(),
                 player.getLocation().getY() + 2.6,

versionsupport_v1_20_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/v1_20_R3.java

@@ -162,13 +162,7 @@ public void minusAmount(Player p, org.bukkit.inventory.@NotNull ItemStack i, int
     public void setSource(TNTPrimed tnt, Player owner) {
         EntityLiving nmsEntityLiving = (((CraftLivingEntity) owner).getHandle());
         EntityTNTPrimed nmsTNT = (((CraftTNTPrimed) tnt).getHandle());
-        try {
-            Field sourceField = EntityTNTPrimed.class.getDeclaredField("g");
-            sourceField.setAccessible(true);
-            sourceField.set(nmsTNT, nmsEntityLiving);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
+        nmsTNT.g = nmsEntityLiving;
     }
 
     @Override
@@ -627,9 +621,7 @@ public String getMainLevel() {
 
     @Override
     public int getVersion() {
-        // impacts on sidebar
-        // experimental score placeholders
-        return 10;
+        return 22;
     }
 
     @Override

versionsupport_v1_20_R4/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R4/v1_20_R4.java

@@ -9,4 +9,9 @@ public class v1_20_R4 extends v1_20_R3 {
     public v1_20_R4(Plugin plugin, String name) {
         super(plugin, name);
     }
+
+    @Override
+    public int getVersion() {
+        return 24;
+    }
 }

versionsupport_v1_21_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_21_R1/TEST_LIST.md

@@ -1,20 +1,22 @@
 New version support Quality Control checklist:
 
 - [ ] Tnt Spoil Feature must show particles over your head
-- [ ] You must not be able to drop the default wooden sword
+- [x] You must not be able to drop the default wooden sword
 - [ ] No errors must appear in console when you place a TNT
-- [ ] No errors must appear in console when you re-spawn
-- [ ] When you try buying team upgrades you must get a chat message
+- [x] No errors must appear in console when you re-spawn
+- [x] When you try buying team upgrades you must get a chat message
 - [x] You must not be able to break your own bed
 - [x] Glass must be resistant from TNT explosions
 - [x] Stained Glass must be resistant from TNT explosions
 - [x] Obsidian must be resistant from TNT explosions
 - [x] Wool covered with Glass or Stained Glass must not explode
-- [ ] You must not be able to take off your armature
-- [ ] You must be able to break blocks placed by players
+- [x] You must not be able to take off your armature
+- [x] You must be able to break blocks placed by players
 - [x] You must not be able to place blocks in team-spawn region
-- [ ] You must not be seen by other players while you are in a re-spawning phase
+- [x] You must not be seen by other players while you are in a re-spawning phase
 - [ ] You must not be able to damage shopkeepers
-- [ ] Shopkeepers must not be targeted by Silverfishes or Iron Golems
-- [ ] You must not be targeted by your own Silverfishes or Iron Golems
-- [ ] There must be no errors at server start up
+- [x] Shopkeepers must not be targeted by Silverfishes or Iron Golems
+- [x] You must not be targeted by your own Silverfishes or Iron Golems
+- [x] There must be no errors at server start up
+- [ ] When you drink an invisibility potion your armor should not be visible to enemies
+- [ ] Language holograms (generator ecc) should not overlap each other

versionsupport_v1_21_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_21_R1/v1_21_R1.java

@@ -17,6 +17,7 @@
 import net.minecraft.world.entity.projectile.IProjectile;
 import net.minecraft.world.item.*;
 import net.minecraft.world.phys.Vec3D;
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.craftbukkit.v1_21_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_21_R1.entity.CraftFireball;
@@ -60,19 +61,13 @@ public void setSource(TNTPrimed tnt, Player owner) {
         //todo tested does not work 05-09-2024 https://github.com/andrei1058/BedWars1058/issues/1040
         EntityLiving nmsEntityLiving = (((CraftLivingEntity) owner).getHandle());
         EntityTNTPrimed nmsTNT = (((CraftTNTPrimed) tnt).getHandle());
-        try {
-            Field sourceField = EntityTNTPrimed.class.getDeclaredField("d");
-            sourceField.setAccessible(true);
-            sourceField.set(nmsTNT, nmsEntityLiving);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
+        nmsTNT.h = nmsEntityLiving;
     }
 
     @Override
     public ClientboundPlayerInfoUpdatePacket getAddPlayer(EntityPlayer player) {
         // todo cache this in production
-        ClientboundPlayerInfoUpdatePacket.a action = (ClientboundPlayerInfoUpdatePacket.a) getPlayerSpawnAction("a");
+        ClientboundPlayerInfoUpdatePacket.a action = (ClientboundPlayerInfoUpdatePacket.a) getPlayerSpawnAction("b");
         return new ClientboundPlayerInfoUpdatePacket(action, player);
     }
 
@@ -143,17 +138,13 @@ public String getMainLevel() {
 
     @Override
     public int getVersion() {
-        return 21;
+        return 25;
     }
 
 
     @Override
     public Fireball setFireballDirection(Fireball fireball, @NotNull Vector vector) {
         EntityFireball fb = ((CraftFireball) fireball).getHandle();
-//        fb.b = vector.getX() * 0.1D;
-//        fb.c = vector.getY() * 0.1D;
-//        fb.d = vector.getZ() * 0.1D;
-        // todo experimental
         fb.a(new Vec3D(vector.getX(), vector.getY(), vector.getZ()), 0.1D);
         return (Fireball) fb.getBukkitEntity();
     }
@@ -183,12 +174,6 @@ public Fireball setFireballDirection(Fireball fireball, @NotNull Vector vector)
         return i.E();
     }
 
-    public ItemStack applyTag(@NotNull ItemStack itemStack, NBTTagCompound tag) {
-        // todo re-apply container?
-//        itemStack.(tag);
-        return itemStack;
-    }
-
     public EntityPlayer getPlayer(Player player) {
         return ((CraftPlayer) player).getHandle();
     }
@@ -208,14 +193,17 @@ private static Object getPlayerSpawnAction(String action) {
         try {
             Class<?> cls = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$a");
             for (Object obj : cls.getEnumConstants()) {
+                Bukkit.getLogger().warning(obj.toString());
                 try {
                     Method m = cls.getMethod("name");
+                    Bukkit.getLogger().warning(m.toString());
                     String name = (String) m.invoke(obj);
+                    Bukkit.getLogger().warning(name.toString());
                     if (action.equals(name)) {
                         return obj;
                     }
                 } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
-                    System.out.println("could not find enum");
+                    Bukkit.getLogger().warning("could not find enum");
                 }
             }
         } catch (Exception exception) {