mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-11-14 14:45:48 +01:00
0c43fe2949
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: c04b005 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.5 1d169e7 Updated Upstream (Paper) EMC Changes: a8914cb8 Remove the ProjectileHitBlockEvent b8f864b5 Updated Paper 42cd3269 Remove FlowerPotPlantEvent and undeprecate FlowerPotRemoveEvent 64b3edf0 Remove the UUID key for setSpawnedEntity 938c6f1b Convert spawn egg entity tag attributes on creature spawn 4cc80284 Disable entityTag conversion since data version isn't accessible in scope 478d83fe Updated Paper 1e409abf Updated Paper Origami Changes: ab42df9 Update Paper Purpur Changes: 7e8bf66 Updated Upstream (Paper & Tuinity) AirplaneLite Changes: 3200f2a Add new webhook for notifications fe01371 Up MC version c585ff5 Updated Upstream (Tuinity)
82 lines
4.2 KiB
Diff
82 lines
4.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ivan Pekov <ivan@mrivanplays.com>
|
|
Date: Fri, 4 Sep 2020 10:07:42 +0300
|
|
Subject: [PATCH] Stop wasting resources on JsonList#get
|
|
|
|
Previously, when a banned player attempted to join the server was removing all the stale entries.
|
|
This caused a resource waste, which was unnoticeable to users that use ban plugins which doesn't
|
|
use the ban list. Akarin's changes for saving it async lowered the pressure, however it was
|
|
still pretty high.
|
|
|
|
Our changes are the following:
|
|
1. Stop removing all stale entries when JsonList#get is called.
|
|
2. Only if a player joins and his ban has expired, remove his ban which triggers a save which then
|
|
triggers removing of all stale entries.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
|
|
index 4094ef76b7b05de1bfcc28aa0ef13033abadeb7e..0224a6d0e47e836fa485b39e7b4ce5b83ea554bf 100644
|
|
--- a/src/main/java/net/minecraft/server/JsonList.java
|
|
+++ b/src/main/java/net/minecraft/server/JsonList.java
|
|
@@ -71,9 +71,13 @@ public abstract class JsonList<K, V extends JsonListEntry<K>> {
|
|
// Paper start
|
|
// this.g();
|
|
// return (V) this.d.get(this.a(k0)); // CraftBukkit - fix decompile error
|
|
+ // Yatopia start - only remove if it expires and has been requested
|
|
+ return this.getBackingMap().get(this.getMappingKey(k0));
|
|
+ /*
|
|
return (V) this.getBackingMap().computeIfPresent(this.getMappingKey(k0), (k, v) -> {
|
|
return v.hasExpired() ? null : v;
|
|
});
|
|
+ */ // Yatopia end
|
|
// Paper end
|
|
}
|
|
|
|
@@ -154,12 +158,22 @@ public abstract class JsonList<K, V extends JsonListEntry<K>> {
|
|
this.removeStaleEntries(); // Paper - remove expired values before saving
|
|
JsonArray jsonarray = new JsonArray();
|
|
|
|
+ // Yatopia start - we're nuking streams wherever possible
|
|
+ /*
|
|
this.d.values().stream().map((jsonlistentry) -> {
|
|
JsonObject jsonobject = new JsonObject();
|
|
|
|
jsonlistentry.getClass();
|
|
return (JsonObject) SystemUtils.a(jsonobject, jsonlistentry::a); // CraftBukkit - decompile error
|
|
}).forEach(jsonarray::add);
|
|
+ */
|
|
+ for (V value : this.d.values()) {
|
|
+ JsonObject obj = new JsonObject();
|
|
+ // todo: obfhelper for this?
|
|
+ value.a(obj);
|
|
+ jsonarray.add(obj);
|
|
+ }
|
|
+ // Yatopia end
|
|
BufferedWriter bufferedwriter = Files.newWriter(this.c, StandardCharsets.UTF_8);
|
|
Throwable throwable = null;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
index 99a67a46bf060aa186a64b4d0608fc60ede609e4..5ef0678c07b04f4b041b3a263d335fb44a14b945 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -647,6 +647,7 @@ public abstract class PlayerList {
|
|
GameProfileBanEntry gameprofilebanentry;
|
|
if (getProfileBans().isBanned(gameprofile) && (gameprofilebanentry = getProfileBans().get(gameprofile)) != null) {
|
|
// Paper end
|
|
+ if (!gameprofilebanentry.hasExpired()) { // Yatopia
|
|
|
|
chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()});
|
|
if (gameprofilebanentry.getExpires() != null) {
|
|
@@ -654,7 +655,11 @@ public abstract class PlayerList {
|
|
}
|
|
|
|
// return chatmessage;
|
|
- if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage)); // Spigot
|
|
+ // Yatopia start
|
|
+ /* if (!gameprofilebanentry.hasExpired()) */ event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage)); // Spigot
|
|
+ } else {
|
|
+ getProfileBans().remove(gameprofile);
|
|
+ } // Yatopia end
|
|
} else if (!this.isWhitelisted(gameprofile, event)) { // Paper
|
|
chatmessage = new ChatMessage("multiplayer.disconnect.not_whitelisted");
|
|
//event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot // Paper - moved to isWhitelisted
|