mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2025-02-18 05:11:20 +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)
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ivan Pekov <ivan@mrivanplays.com>
|
|
Date: Tue, 29 Dec 2020 08:47:43 +0200
|
|
Subject: [PATCH] Add a special case for floodgate and offline uuids
|
|
|
|
floodgate spoofs uuids, but plugins such as luckperms get the uuid that the server uses, causing problems
|
|
if this option is configured properly, such things won't happen
|
|
|
|
diff --git a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
|
|
index 2d4fb0a4664578f8d5c23db854eb8f2764724940..00c600d74ba84cb564b9b22f53f279a93839d71f 100644
|
|
--- a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
|
|
+++ b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
|
|
@@ -225,7 +225,16 @@ public class YatopiaConfig {
|
|
fixFallDistance = getBoolean("settings.fixFallDistance", false);
|
|
}
|
|
|
|
+ public static boolean usingFloodgate = false;
|
|
+ private static void usingFloodgate() {
|
|
+ usingFloodgate = getBoolean("settings.using-floodgate", false);
|
|
+ }
|
|
+
|
|
public static boolean shouldUseOfflineUUID() {
|
|
+ if (usingFloodgate) {
|
|
+ // never cuz floodgate spoofs an uuid
|
|
+ return false;
|
|
+ }
|
|
if (org.spigotmc.SpigotConfig.bungee && com.destroystokyo.paper.PaperConfig.bungeeOnlineMode) {
|
|
return false;
|
|
}
|