diff --git a/BauSystem_12/src/de/steamwar/bausystem/commands/TPSLimit_12.java b/BauSystem_12/src/de/steamwar/bausystem/commands/TPSLimit_12.java
new file mode 100644
index 0000000..d32d4cb
--- /dev/null
+++ b/BauSystem_12/src/de/steamwar/bausystem/commands/TPSLimit_12.java
@@ -0,0 +1,79 @@
+/*
+ This file is a part of the SteamWar software.
+
+ Copyright (C) 2020 SteamWar.de-Serverteam
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+package de.steamwar.bausystem.commands;
+
+import net.minecraft.server.v1_12_R1.*;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
+import org.bukkit.entity.TNTPrimed;
+
+import java.util.HashSet;
+import java.util.Set;
+
+class TPSLimit_12 {
+
+ private static Set velocityPackets = new HashSet<>();
+
+ static void createVelocityPacketCache(World world) {
+ velocityPackets.clear();
+ world.getEntitiesByClasses(TNTPrimed.class).forEach(entity -> {
+ velocityPackets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), 0, 0, 0));
+ });
+ }
+
+ static void sendVelocityPackets() {
+ sendPacketsToPlayer(velocityPackets);
+ }
+
+ static void sendTntMetaData(World world) {
+ Set> packets = new HashSet<>();
+
+ world.getEntitiesByClasses(TNTPrimed.class).forEach(entity -> {
+ net.minecraft.server.v1_12_R1.Entity serverEntity = ((CraftEntity) entity).getHandle();
+
+ packets.add(new PacketPlayOutEntityMetadata(serverEntity.getId(), serverEntity.getDataWatcher(), true));
+ });
+
+ sendPacketsToPlayer(packets);
+ }
+
+ static void sendTntData(World world) {
+ Set> packets = new HashSet<>();
+
+ world.getEntitiesByClasses(TNTPrimed.class).forEach(entity -> {
+ net.minecraft.server.v1_12_R1.Entity serverEntity = ((CraftEntity) entity).getHandle();
+ packets.add(new PacketPlayOutEntityTeleport(serverEntity));
+ });
+
+ sendPacketsToPlayer(packets);
+ }
+
+ static void sendPacketsToPlayer(Set> packets) {
+ Bukkit.getOnlinePlayers().forEach(player -> {
+ PlayerConnection connection = ((CraftPlayer)player).getHandle().playerConnection;
+ for (Packet p : packets) {
+ connection.sendPacket(p);
+ }
+ });
+ }
+
+}
diff --git a/BauSystem_15/src/de/steamwar/bausystem/commands/TPSLimit_15.java b/BauSystem_15/src/de/steamwar/bausystem/commands/TPSLimit_15.java
new file mode 100644
index 0000000..cb32794
--- /dev/null
+++ b/BauSystem_15/src/de/steamwar/bausystem/commands/TPSLimit_15.java
@@ -0,0 +1,80 @@
+/*
+ This file is a part of the SteamWar software.
+
+ Copyright (C) 2020 SteamWar.de-Serverteam
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+package de.steamwar.bausystem.commands;
+
+import net.minecraft.server.v1_15_R1.*;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
+import org.bukkit.entity.TNTPrimed;
+
+import java.util.HashSet;
+import java.util.Set;
+
+class TPSLimit_15 {
+
+ private static Set velocityPackets = new HashSet<>();
+ private static final Vec3D noMotion = new Vec3D(0, 0, 0);
+
+ static void createVelocityPacketCache(World world) {
+ velocityPackets.clear();
+ world.getEntitiesByClasses(TNTPrimed.class).forEach(entity -> {
+ velocityPackets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), noMotion));
+ });
+ }
+
+ static void sendVelocityPackets() {
+ sendPacketsToPlayer(velocityPackets);
+ }
+
+ static void sendTntMetaData(World world) {
+ Set> packets = new HashSet<>();
+
+ world.getEntitiesByClasses(TNTPrimed.class).forEach(entity -> {
+ net.minecraft.server.v1_15_R1.Entity serverEntity = ((CraftEntity) entity).getHandle();
+
+ packets.add(new PacketPlayOutEntityMetadata(serverEntity.getId(), serverEntity.getDataWatcher(), true));
+ });
+
+ sendPacketsToPlayer(packets);
+ }
+
+ static void sendTntData(World world) {
+ Set> packets = new HashSet<>();
+
+ world.getEntitiesByClasses(TNTPrimed.class).forEach(entity -> {
+ net.minecraft.server.v1_15_R1.Entity serverEntity = ((CraftEntity) entity).getHandle();
+ packets.add(new PacketPlayOutEntityTeleport(serverEntity));
+ });
+
+ sendPacketsToPlayer(packets);
+ }
+
+ static void sendPacketsToPlayer(Set> packets) {
+ Bukkit.getOnlinePlayers().forEach(player -> {
+ PlayerConnection connection = ((CraftPlayer)player).getHandle().playerConnection;
+ for (Packet p : packets) {
+ connection.sendPacket(p);
+ }
+ });
+ }
+
+}
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java
index 7b551e4..94df329 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java
@@ -22,23 +22,17 @@ package de.steamwar.bausystem.commands;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission;
import de.steamwar.bausystem.world.Welt;
+import de.steamwar.core.Core;
import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent;
-import net.minecraft.server.v1_15_R1.*;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
import org.bukkit.scheduler.BukkitTask;
-import java.util.HashSet;
-import java.util.Set;
-
public class CommandTPSLimiter implements CommandExecutor {
private static int currentTPSLimit = 20;
@@ -48,26 +42,6 @@ public class CommandTPSLimiter implements CommandExecutor {
private BukkitTask tpsLimiter = null;
- public CommandTPSLimiter() {
-
- }
-
- private void sendPlayers(Packet packet) {
- Bukkit.getOnlinePlayers().forEach(player -> {
- PlayerConnection connection = ((CraftPlayer)player).getHandle().playerConnection;
- connection.sendPacket(packet);
- });
- }
-
- private void sendPlayers(Set> packets) {
- Bukkit.getOnlinePlayers().forEach(player -> {
- PlayerConnection connection = ((CraftPlayer)player).getHandle().playerConnection;
- for (Packet p : packets) {
- connection.sendPacket(p);
- }
- });
- }
-
private boolean permissionCheck(Player player) {
if (Welt.noPermission(player, Permission.world)) {
player.sendMessage(BauSystem.PREFIX + "§cDu darfst hier nicht den TPS-Limiter nutzen");
@@ -130,16 +104,11 @@ public class CommandTPSLimiter implements CommandExecutor {
tpsLimiter = Bukkit.getScheduler().runTaskTimer(BauSystem.getPlugin(), () -> {
sendTntMetaData();
- Vec3D noMotion = new Vec3D(0, 0, 0);
- Set velocityPackets = new HashSet<>();
- world.getEntitiesByClasses(TNTPrimed.class).forEach(entity -> {
- velocityPackets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), noMotion));
- });
-
+ createVelocityData();
for (int i = 0; i < (20 / currentTPSLimit); i++) {
sleepUntilNextTick();
sendTntData();
- sendPlayers(velocityPackets);
+ sendVelocityData();
}
}, 0, 1);
}
@@ -164,25 +133,44 @@ public class CommandTPSLimiter implements CommandExecutor {
}
}
- private void sendTntMetaData() {
- world.getEntitiesByClasses(TNTPrimed.class).forEach(entity -> {
- net.minecraft.server.v1_15_R1.Entity serverEntity = ((CraftEntity) entity).getHandle();
+ private void createVelocityData() {
+ switch (Core.getVersion()) {
+ case 15:
+ TPSLimit_15.createVelocityPacketCache(world);
+ break;
+ default:
+ TPSLimit_12.createVelocityPacketCache(world);
+ }
+ }
- PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(serverEntity.getId(), serverEntity.getDataWatcher(), true);
- sendPlayers(packetPlayOutEntityMetadata);
- });
+ private void sendVelocityData() {
+ switch (Core.getVersion()) {
+ case 15:
+ TPSLimit_15.sendVelocityPackets();
+ break;
+ default:
+ TPSLimit_12.sendVelocityPackets();
+ }
+ }
+
+ private void sendTntMetaData() {
+ switch (Core.getVersion()) {
+ case 15:
+ TPSLimit_15.sendTntMetaData(world);
+ break;
+ default:
+ TPSLimit_12.sendTntMetaData(world);
+ }
}
private void sendTntData() {
- Set> packets = new HashSet<>();
-
- world.getEntitiesByClasses(TNTPrimed.class).forEach(entity -> {
- net.minecraft.server.v1_15_R1.Entity serverEntity = ((CraftEntity) entity).getHandle();
- packets.add(new PacketPlayOutEntityTeleport(serverEntity));
- // packets.add(new PacketPlayOutEntityVelocity(serverEntity.getId(), noMotion));
- });
-
- sendPlayers(packets);
+ switch (Core.getVersion()) {
+ case 15:
+ TPSLimit_15.sendTntData(world);
+ break;
+ default:
+ TPSLimit_12.sendTntData(world);
+ }
}
public static int getCurrentTPSLimit() {