OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 15:49:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Updated Upstream (Spigot) (#4745)"

Browse source 
This reverts commit 27979ca2fa.
This commit is contained in:
Shane Freeder 2020-11-09 00:09:37 +00:00
parent 27979ca2fa
commit fe115b0ebe
7 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
Spigot-Server-Patches/0548-Brand-support.patch → Spigot-Server-Patches/0549-Brand-support.patch
View file

0
Spigot-Server-Patches/0558-Brand-support.patch → Spigot-Server-Patches/0559-Brand-support.patch
View file

4
Spigot-Server-Patches/Configurable-Alternative-LootPool-Luck-Formula.patch
View file

@ -40,8 +40,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {
private static void authenticationServersDownKickMessage() {
authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
"such as inventories, experience points, advancements and the like will not be saved when they log out.");
}
}
+
+ public static boolean useAlternativeLuckFormula = false;

6
Spigot-Server-Patches/Configurable-connection-throttle-kick-message.patch
View file

@ -17,9 +17,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ connectionThrottleKickMessage = getString("messages.kick.connection-throttle", connectionThrottleKickMessage);
+ }
+
public static boolean useAlternativeLuckFormula = false;
private static void useAlternativeLuckFormula() {
useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false);
public static boolean savePlayerData = true;
private static void savePlayerData() {
savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java

36
Spigot-Server-Patches/Make-player-data-saving-configurable.patch Normal file
View file

@ -0,0 +1,36 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Mon, 26 Mar 2018 18:30:53 +0300
Subject: [PATCH] Make player data saving configurable
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {
private static void authenticationServersDownKickMessage() {
authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
}
+
+ public static boolean savePlayerData = true;
+ private static void savePlayerData() {
+ savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
+ if(!savePlayerData) {
+ Bukkit.getLogger().log(Level.WARNING, "Player Data Saving is currently disabled. Any changes to your players data, " +
+ "such as inventories, experience points, advancements and the like will not be saved when they log out.");
+ }
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -0,0 +0,0 @@ public class WorldNBTStorage {
}
public void save(EntityHuman entityhuman) {
+ if(!com.destroystokyo.paper.PaperConfig.savePlayerData) return; // Paper - Make player data saving configurable
try {
NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
File file = File.createTempFile(entityhuman.getUniqueIDString() + "-", ".dat", this.playerDir);

6
Spigot-Server-Patches/Make-the-default-permission-message-configurable.patch
View file

@ -25,9 +25,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ noPermissionMessage = ChatColor.translateAlternateColorCodes('&', getString("messages.no-permission", noPermissionMessage));
+ }
+
public static boolean useAlternativeLuckFormula = false;
private static void useAlternativeLuckFormula() {
useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false);
public static boolean savePlayerData = true;
private static void savePlayerData() {
savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java

2
work/Spigot

@ -1 +1 @@
Subproject commit a19903d24b3189e8769657b9b130f7ed5919b8b8
Subproject commit 37d799b230195de166af55b0a746310ddcf92bc0