Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
18c3716c49
This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
98 Zeilen
5.5 KiB
Diff
98 Zeilen
5.5 KiB
Diff
From 52755667f1f619ec704fc039220647e7d105956d Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Tue, 1 Mar 2016 14:32:43 -0600
|
|
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
|
|
stats
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
|
|
index 8361888c2..3623751bf 100644
|
|
--- a/src/main/java/net/minecraft/server/EULA.java
|
|
+++ b/src/main/java/net/minecraft/server/EULA.java
|
|
@@ -51,7 +51,8 @@ public class EULA {
|
|
|
|
fileoutputstream = new FileOutputStream(this.b);
|
|
properties.setProperty("eula", "false");
|
|
- properties.store(fileoutputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).");
|
|
+ properties.store(fileoutputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula)." +
|
|
+ "\nand also agreeing that tacos are tasty."); // Paper - fix lag
|
|
} catch (Exception exception) {
|
|
EULA.a.warn("Failed to save {}", this.b, exception);
|
|
} finally {
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index 8d08b536a..92d480251 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -1049,7 +1049,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
|
}
|
|
|
|
public String getServerModName() {
|
|
- return "Spigot"; // Spigot - Spigot > // CraftBukkit - cb > vanilla!
|
|
+ return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
|
|
}
|
|
|
|
public CrashReport b(CrashReport crashreport) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 9042deed6..33b40ffc2 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -136,7 +136,7 @@ import org.bukkit.event.server.TabCompleteEvent;
|
|
import net.md_5.bungee.api.chat.BaseComponent;
|
|
|
|
public final class CraftServer implements Server {
|
|
- private final String serverName = "CraftBukkit";
|
|
+ private final String serverName = "Paper";
|
|
private final String serverVersion;
|
|
private final String bukkitVersion = Versioning.getBukkitVersion();
|
|
private final Logger logger = Logger.getLogger("Minecraft");
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
index 96585fb24..f95da9e26 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -192,7 +192,7 @@ public class Main {
|
|
deadline.add(Calendar.DAY_OF_YEAR, -14);
|
|
if (buildDate.before(deadline.getTime())) {
|
|
System.err.println("*** Error, this build is outdated ***");
|
|
- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***");
|
|
+ System.err.println("*** Please download a new build as per instructions from https://paperci.emc.gs/ ***"); // Paper
|
|
System.err.println("*** Server will start in 15 seconds ***");
|
|
Thread.sleep(TimeUnit.SECONDS.toMillis(15));
|
|
}
|
|
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
|
index 94a3d4237..91b8aa6a1 100644
|
|
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
|
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
|
@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
|
|
|
|
private WatchdogThread(long timeoutTime, boolean restart)
|
|
{
|
|
- super( "Spigot Watchdog Thread" );
|
|
+ super( "Paper Watchdog Thread" );
|
|
this.timeoutTime = timeoutTime;
|
|
this.restart = restart;
|
|
}
|
|
@@ -56,9 +56,9 @@ public class WatchdogThread extends Thread
|
|
{
|
|
Logger log = Bukkit.getServer().getLogger();
|
|
log.log( Level.SEVERE, "The server has stopped responding!" );
|
|
- log.log( Level.SEVERE, "Please report this to http://www.spigotmc.org/" );
|
|
+ log.log( Level.SEVERE, "Please report this to https://github.com/PaperMC/Paper/issues" );
|
|
log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
|
|
- log.log( Level.SEVERE, "Spigot version: " + Bukkit.getServer().getVersion() );
|
|
+ log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() );
|
|
//
|
|
if(net.minecraft.server.World.haveWeSilencedAPhysicsCrash)
|
|
{
|
|
@@ -68,7 +68,7 @@ public class WatchdogThread extends Thread
|
|
}
|
|
//
|
|
log.log( Level.SEVERE, "------------------------------" );
|
|
- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" );
|
|
+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
|
|
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
|
|
log.log( Level.SEVERE, "------------------------------" );
|
|
//
|
|
--
|
|
2.18.0
|
|
|