Mineattack/PvpTogglePlugin
4
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Menu shows now Playerheads

Browse Source 
removed Debug Messages
This commit is contained in:
Benkralex
2023-08-30 16:38:08 +02:00
parent ecde8fbee1
commit 29782f8454
3 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvptogglepluginworkspace/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>benkralex</groupId>
<artifactId>Pvptoggle</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.8-FINAL</version>
<packaging>jar</packaging>
<name>Pvptoggle</name>
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java
+37
View File
@@ -12,10 +12,13 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.SkullMeta;
import org.bukkit.persistence.PersistentDataContainer;
import org.bukkit.persistence.PersistentDataType;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
public class InventoryMenu {
public static final int PVP_TOGGLE=0;
@@ -194,6 +197,23 @@ public class InventoryMenu {
public static Inventory pvpBlacklistMenu(Player p) {
Inventory inv = Bukkit.createInventory(null, 3*9, "Blacklist-Menu");
PersistentDataContainer pdc = p.getPersistentDataContainer();
PersistentDataContainer pBlacklist = pdc.get(new NamespacedKey(Pvptoggle.pvptoggle, "blacklist"), PersistentDataType.TAG_CONTAINER);
int i = 0;
for (NamespacedKey blacklistedPlayerUuid:pBlacklist.getKeys()) {
ItemStack item = new ItemStack(Material.PLAYER_HEAD);
SkullMeta m = (SkullMeta) item.getItemMeta();
m.setDisplayName(ChatColor.GREEN + Bukkit.getPlayer(UUID.fromString(blacklistedPlayerUuid.getKey())).getDisplayName());
m.setOwningPlayer(Bukkit.getPlayer(UUID.fromString(blacklistedPlayerUuid.getKey())));
item.setItemMeta(m);
if (!((i == 8) || (i == 26))) {
inv.setItem(i, item);
} else {
i++;
inv.setItem(i, item);
}
i++;
}
inv.setItem(8, getMenuItem(CLOSE, p));
inv.setItem(26, getMenuItem(BACK, p));
@@ -203,6 +223,23 @@ public class InventoryMenu {
public static Inventory pvpWhitelistMenu(Player p) {
Inventory inv = Bukkit.createInventory(null, 3*9, "Whitelist-Menu");
PersistentDataContainer pdc = p.getPersistentDataContainer();
PersistentDataContainer pWhitelist = pdc.get(new NamespacedKey(Pvptoggle.pvptoggle, "whitelist"), PersistentDataType.TAG_CONTAINER);
int i = 0;
for (NamespacedKey whitelistedPlayerUuid:pWhitelist.getKeys()) {
ItemStack item = new ItemStack(Material.PLAYER_HEAD);
SkullMeta m = (SkullMeta) item.getItemMeta();
m.setDisplayName(ChatColor.GREEN + Bukkit.getPlayer(UUID.fromString(whitelistedPlayerUuid.getKey())).getDisplayName());
m.setOwningPlayer(Bukkit.getPlayer(UUID.fromString(whitelistedPlayerUuid.getKey())));
item.setItemMeta(m);
if (!((i == 8) || (i == 26))) {
inv.setItem(i, item);
} else {
i++;
inv.setItem(i, item);
}
i++;
}
inv.setItem(8, getMenuItem(CLOSE, p));
inv.setItem(26, getMenuItem(BACK, p));
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Util.java
+3 -33
View File
@@ -30,38 +30,8 @@ public class Util {
blacklisted = false;
}
//return (!(toggle||ultravictim)||checkPvPData(damager,victim))&&!ultradamager;
//debug
victim.sendMessage(ChatColor.RED + "DEBUG:");
victim.sendMessage("Rückschlag: " + checkPvPData(damager,victim));
victim.sendMessage("Damager in Whitelist: " + whitelisted);
victim.sendMessage("Damager in Blacklist: " + blacklisted);
victim.sendMessage("PvP-Schutz (Toggle): " + toggle);
victim.sendMessage("PvP-Schutz (Ultra): " + ultravictim);
victim.sendMessage("Ultra bei Damager: " + ultradamager);
victim.sendMessage("Schutz: " + (toggle||ultravictim));
victim.sendMessage(" ");
victim.sendMessage("2.Oder: " + (whitelisted && !ultradamager));
victim.sendMessage("3.Oder: " + ((!toggle||!ultravictim) && !blacklisted && !ultradamager));
damager.sendMessage(ChatColor.RED + "DEBUG:");
damager.sendMessage("Rückschlag: " + checkPvPData(damager,victim));
damager.sendMessage("Damager in Whitelist: " + whitelisted);
damager.sendMessage("Damager in Blacklist: " + blacklisted);
damager.sendMessage("Victim PvP-Schutz (Toggle): " + toggle);
damager.sendMessage("Victim PvP-Schutz (Ultra): " + ultravictim);
damager.sendMessage("Ultra bei Damager: " + ultradamager);
damager.sendMessage("Victim Schutz: " + (toggle||ultravictim));
damager.sendMessage(" ");
damager.sendMessage("2.Oder: " + (whitelisted && !ultradamager));
damager.sendMessage("3.Oder: " + ((!toggle||!ultravictim) && !blacklisted && !ultradamager));
Pvptoggle.pvptoggle.getLogger().info("1.Oder: " + checkPvPData(damager,victim));
Pvptoggle.pvptoggle.getLogger().info("2.Oder: " + (whitelisted && !ultradamager));
Pvptoggle.pvptoggle.getLogger().info("3.Oder: " + (((!toggle||!ultravictim) && !blacklisted && !ultradamager)?"true":"false"));
//debug ende
return checkPvPData(damager,victim) || (whitelisted && !ultradamager) || ((!toggle && !ultravictim) && !blacklisted && !ultradamager);
//einstellung ob ultradamager an kein rückschlag
return (checkPvPData(damager,victim) && !ultradamager) || (whitelisted && !ultradamager) || ((!toggle && !ultravictim) && !blacklisted && !ultradamager);
}
public static boolean checkPvPData(Player damager, Player victim){
String victimUUID = victim.getUniqueId().toString();
@@ -76,7 +46,7 @@ public class Util {
}
public static void delOldData(PersistentDataContainer pvpdamagers){
for(NamespacedKey damagerKey:pvpdamagers.getKeys()){
if(pvpdamagers.get(damagerKey, PersistentDataType.LONG) >= Instant.now().getEpochSecond() - Config.getPvpTime()){
if(pvpdamagers.get(damagerKey, PersistentDataType.LONG) <= Instant.now().getEpochSecond() - Config.getPvpTime()){
pvpdamagers.remove(damagerKey);
}
}