SteamWar/SpigotCore
Archiviert
13
0

Merge branch 'master' into schematic-node

Dieser Commit ist enthalten in:
Chaoscaot 2021-07-10 12:11:21 +02:00
Commit 62d6adaa46
4 geänderte Dateien mit 9 neuen und 1 gelöschten Zeilen

Datei anzeigen

@ -51,6 +51,7 @@ public class BungeeReceiver implements PluginMessageListener {
} }
}); });
registerHandler(PacketIdManager.BAUMEMBER_UPDATE, byteArrayDataInput -> BauweltMember.clear());
registerHandler(PacketIdManager.INVENTORY_PACKET, new InventoryHandler()); registerHandler(PacketIdManager.INVENTORY_PACKET, new InventoryHandler());
registerHandler(PacketIdManager.INVENTORY_CLOSE_PACKET, byteArrayDataInput -> { registerHandler(PacketIdManager.INVENTORY_CLOSE_PACKET, byteArrayDataInput -> {
Player player = Bukkit.getPlayer(SteamwarUser.get(byteArrayDataInput.readInt()).getUUID()); Player player = Bukkit.getPlayer(SteamwarUser.get(byteArrayDataInput.readInt()).getUUID());

Datei anzeigen

@ -25,6 +25,7 @@ public class PacketIdManager {
public final static byte PING_PACKET = 0x01; public final static byte PING_PACKET = 0x01;
public final static byte TABLIST_NAME = 0x02; public final static byte TABLIST_NAME = 0x02;
public static final byte PREPARE_SCHEM = 0x03; public static final byte PREPARE_SCHEM = 0x03;
public final static byte BAUMEMBER_UPDATE = 0x04;
//0x1(X) Bungee Inventory //0x1(X) Bungee Inventory
public final static byte INVENTORY_PACKET = 0x10; public final static byte INVENTORY_PACKET = 0x10;
public final static byte INVENTORY_CALLBACK_PACKET = 0x11; public final static byte INVENTORY_CALLBACK_PACKET = 0x11;

Datei anzeigen

@ -34,6 +34,10 @@ public class BauweltMember{
private static final List<BauweltMember> members = new ArrayList<>(); private static final List<BauweltMember> members = new ArrayList<>();
public static void clear() {
members.clear();
}
private BauweltMember(int ownerID, int memberID, boolean worldEdit, boolean world, boolean updateDB){ private BauweltMember(int ownerID, int memberID, boolean worldEdit, boolean world, boolean updateDB){
bauweltID = ownerID; bauweltID = ownerID;
this.memberID = memberID; this.memberID = memberID;

Datei anzeigen

@ -35,7 +35,6 @@ public class SWException {
static { static {
List<String> reasons = new ArrayList<>(); List<String> reasons = new ArrayList<>();
reasons.add("Initializing Legacy Material Support.");
reasons.add("Could not save the list after adding a user."); reasons.add("Could not save the list after adding a user.");
reasons.add("Could not save spigot.yml"); reasons.add("Could not save spigot.yml");
reasons.add("Failed to save operators list:"); reasons.add("Failed to save operators list:");
@ -68,6 +67,9 @@ public class SWException {
reasons.add("Ignoring unknown attribute"); reasons.add("Ignoring unknown attribute");
reasons.add("Skipping player strafe phase because no player was found"); reasons.add("Skipping player strafe phase because no player was found");
reasons.add("Couldn't save chunk; already in use by another instance of Minecraft?"); reasons.add("Couldn't save chunk; already in use by another instance of Minecraft?");
reasons.add("Failed to save player data for ");
reasons.add("Failed to check session lock for world located at");
reasons.add("Saving oversized chunk ");
ignorereasons = Collections.unmodifiableList(reasons); ignorereasons = Collections.unmodifiableList(reasons);
} }