diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 000000000..8dab0da14 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,8 @@ + + + fr.brouillard.oss + jgitver-maven-plugin + 1.8.0 + + \ No newline at end of file diff --git a/bedwars-api/.mvn/extensions.xml b/bedwars-api/.mvn/extensions.xml new file mode 100644 index 000000000..8dab0da14 --- /dev/null +++ b/bedwars-api/.mvn/extensions.xml @@ -0,0 +1,8 @@ + + + fr.brouillard.oss + jgitver-maven-plugin + 1.8.0 + + \ No newline at end of file diff --git a/bedwars-api/pom.xml b/bedwars-api/pom.xml index 7a7646092..09539cb15 100644 --- a/bedwars-api/pom.xml +++ b/bedwars-api/pom.xml @@ -5,7 +5,7 @@ BedWars1058 com.andrei1058.bedwars - 22.3-SNAPSHOT + ${jgitver.calcuated_version} 4.0.0 bedwars-api diff --git a/bedwars-plugin/.mvn/extensions.xml b/bedwars-plugin/.mvn/extensions.xml new file mode 100644 index 000000000..8dab0da14 --- /dev/null +++ b/bedwars-plugin/.mvn/extensions.xml @@ -0,0 +1,8 @@ + + + fr.brouillard.oss + jgitver-maven-plugin + 1.8.0 + + \ No newline at end of file diff --git a/bedwars-plugin/pom.xml b/bedwars-plugin/pom.xml index cd1d36e00..04d5d61e4 100644 --- a/bedwars-plugin/pom.xml +++ b/bedwars-plugin/pom.xml @@ -5,22 +5,13 @@ BedWars1058 com.andrei1058.bedwars - 22.3-SNAPSHOT + ${jgitver.calcuated_version} 4.0.0 bedwars-plugin jar ${parent.version} - - - - maven-snapshots - https://repository.apache.org/content/repositories/snapshots/ - - - simonsators-repo @@ -62,10 +53,10 @@ alessioDP-releases https://repo.alessiodp.com/releases/ - + @@ -197,11 +188,11 @@ versionsupport_v1_17_R1 ${project.version} - - com.andrei1058.bedwars - versionsupport_v1_18_R1 - ${project.version} - + + + + + com.andrei1058.bedwars versionsupport-common @@ -210,7 +201,7 @@ org.spigotmc spigot - 1.8.8-R0.1-SNAPSHOT + 1.16.5-R0.1-SNAPSHOT provided @@ -282,7 +273,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.3.1-SNAPSHOT + 3.3.0 @@ -322,6 +313,26 @@ true + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.5.1 + + + default-deploy + deploy + + deploy + + + + + kwadratowa-games-repository + https://nexus.kwadratowa.games + true + + diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/listeners/BreakPlace.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/listeners/BreakPlace.java index c0dfe5597..47b8104d9 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/listeners/BreakPlace.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/listeners/BreakPlace.java @@ -289,6 +289,7 @@ public void onBlockBreak(BlockBreakEvent e) { } } else { e.setCancelled(false); + e.setDropItems(false); t.setBedDestroyed(true); a.addPlayerBedDestroyed(p); PlayerBedBreakEvent breakEvent; diff --git a/bedwars-plugin/src/main/resources/plugin.yml b/bedwars-plugin/src/main/resources/plugin.yml index 1818b4e3c..a202a7950 100644 --- a/bedwars-plugin/src/main/resources/plugin.yml +++ b/bedwars-plugin/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: BedWars1058 api-version: '1.13' version: ${project.version} -author: andrei1058 +author: andrei10581 description: BedWars minigame by andrei1058 main: com.andrei1058.bedwars.BedWars softdepend: [Vault,PlaceholderAPI,Citizens,Parties,SlimeWorldManager,VipFeatures,Enhanced-SlimeWorldManager,PartyAndFriends,Spigot-Party-API-PAF] diff --git a/pom.xml b/pom.xml index b1dc09d4e..3771ef471 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.andrei1058.bedwars BedWars1058 pom - 22.3-SNAPSHOT + ${jgitver.calcuated_version} UTF-8 @@ -114,17 +114,14 @@ versionsupport_1_16_R2 versionsupport_v1_16_R3 versionsupport_v1_17_R1 - versionsupport_v1_18_R1 + - ftp-repo - ftp://andrei1058.dev/releases + kwadratowa-games-repository + https://nexus.kwadratowa.games/repository/kwadratowa-games/ - - ftp-repo - ftp://andrei1058.dev/snapshots - + diff --git a/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java b/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java index fa7435618..801e12138 100644 --- a/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java +++ b/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java @@ -279,41 +279,24 @@ public void voidKill(Player p) { @Override public void hideArmor(Player victim, Player receiver) { List> items = new ArrayList<>(); - List> hands = new ArrayList<>(); - hands.add(new Pair<>(EnumItemSlot.MAINHAND, new ItemStack(net.minecraft.server.v1_16_R3.Item.getById(0)))); - hands.add(new Pair<>(EnumItemSlot.OFFHAND, new ItemStack(net.minecraft.server.v1_16_R3.Item.getById(0)))); - items.add(new Pair<>(EnumItemSlot.HEAD, new ItemStack(net.minecraft.server.v1_16_R3.Item.getById(0)))); items.add(new Pair<>(EnumItemSlot.CHEST, new ItemStack(net.minecraft.server.v1_16_R3.Item.getById(0)))); items.add(new Pair<>(EnumItemSlot.LEGS, new ItemStack(net.minecraft.server.v1_16_R3.Item.getById(0)))); items.add(new Pair<>(EnumItemSlot.FEET, new ItemStack(net.minecraft.server.v1_16_R3.Item.getById(0)))); PacketPlayOutEntityEquipment packet1 = new PacketPlayOutEntityEquipment(victim.getEntityId(), items); - PacketPlayOutEntityEquipment packet2 = new PacketPlayOutEntityEquipment(victim.getEntityId(), hands); EntityPlayer pc = ((CraftPlayer) receiver).getHandle(); - if (victim != receiver) { - pc.playerConnection.sendPacket(packet2); - } pc.playerConnection.sendPacket(packet1); } @Override public void showArmor(Player victim, Player receiver) { List> items = new ArrayList<>(); - List> hands = new ArrayList<>(); - - hands.add(new Pair<>(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(victim.getInventory().getItemInMainHand()))); - hands.add(new Pair<>(EnumItemSlot.OFFHAND, CraftItemStack.asNMSCopy(victim.getInventory().getItemInOffHand()))); - items.add(new Pair<>(EnumItemSlot.HEAD, CraftItemStack.asNMSCopy(victim.getInventory().getHelmet()))); items.add(new Pair<>(EnumItemSlot.CHEST, CraftItemStack.asNMSCopy(victim.getInventory().getChestplate()))); items.add(new Pair<>(EnumItemSlot.LEGS, CraftItemStack.asNMSCopy(victim.getInventory().getLeggings()))); items.add(new Pair<>(EnumItemSlot.FEET, CraftItemStack.asNMSCopy(victim.getInventory().getBoots()))); PacketPlayOutEntityEquipment packet1 = new PacketPlayOutEntityEquipment(victim.getEntityId(), items); - PacketPlayOutEntityEquipment packet2 = new PacketPlayOutEntityEquipment(victim.getEntityId(), hands); EntityPlayer pc = ((CraftPlayer) receiver).getHandle(); - if (victim != receiver) { - pc.playerConnection.sendPacket(packet2); - } pc.playerConnection.sendPacket(packet1); } @@ -666,8 +649,9 @@ public Fireball setFireballDirection(Fireball fireball, Vector vector) { @Override public void playRedStoneDot(Player player) { Color color = Color.RED; - PacketPlayOutWorldParticles particlePacket = new PacketPlayOutWorldParticles(new ParticleParamRedstone((float) color.getRed(), (float) color.getBlue(), (float) color.getGreen(), (float) 1), - true, (float) player.getLocation().getX(), (float) (player.getLocation().getY() + 2.6), (float) player.getLocation().getZ(), 0, 0, 0, 0, 0); + PacketPlayOutWorldParticles particlePacket = new PacketPlayOutWorldParticles( + new ParticleParamRedstone((float) color.getRed(), (float) color.getGreen(), (float) color.getBlue(), (float) 1), + true, player.getLocation().getX(), player.getLocation().getY() + 2.2, player.getLocation().getZ(), 0, 0, 0, 0, 1); for (Player inWorld : player.getWorld().getPlayers()) { if (inWorld.equals(player)) continue; ((CraftPlayer) inWorld).getHandle().playerConnection.sendPacket(particlePacket);