Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade TPSBar

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-14 19:11:04 -05:00
parent 4626edf67b
commit 9d553d3327
37 changed files with 287 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0003-Purpur-config-files.patch
View File

@@ -29,7 +29,7 @@ index 3918b24c98faa5232c7ffd733ba8000562132785..4d8740678049aa749b42618470e9cc83
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 98b71384508447adc80c2175f8e35e5d86b0c378..4f49a0b2bb22b95503c3f6a0b304f287ee9048ae 100644
index f101302892a7f95ffa0e6d63cb69d8a3ddbd67a7..a8d99549afbfbb0cbb45dd9dc278315e5ae5ea9d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -118,6 +118,11 @@ public class PaperConfig {
@@ -123,19 +123,21 @@ index 61a4dea715689b0ce9247040db5dd2080ee2e167..ffe76b8afd2a2c3153751c73ee7bbf4c
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..fcf5f32c32eb17f7580b3c8c9190e36725f793ad
index 0000000000000000000000000000000000000000..d0d87fcca78ea5c7853d693bc617c2bd6cfed487
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,157 @@
@@ -0,0 +1,159 @@
+package net.pl3x.purpur;
+
+import co.aikar.timings.TimingsManager;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import net.kyori.adventure.bossbar.BossBar;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.entity.EntityDimensions;
+import net.minecraft.world.entity.EntityType;
+import net.pl3x.purpur.command.PurpurCommand;
+import net.pl3x.purpur.task.TPSBarTask;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.configuration.ConfigurationSection;
@@ -456,7 +458,7 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ce46da5d75049ad2ec2db677569e35f13960dafa..5a9e6b904893be6782a50b89582e6a8e7e3ef7e7 100644
index a173b6b0e49bec5d0b0d15384526cb261000bf33..b018082b7703b07285a0ba4717f25da9c57cfbfc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -876,6 +876,7 @@ public final class CraftServer implements Server {
@@ -503,7 +505,7 @@ index ce46da5d75049ad2ec2db677569e35f13960dafa..5a9e6b904893be6782a50b89582e6a8e
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index c59deadcfbfd5afbf951a167979a4eceb0c63579..a335d1689ebf01e0e96a45c640188dc024610e2c 100644
index b153a8c9e7fdf5560148f02ba2f52c37ad3b5ace..0242b57665fd93644366d1cb00ea008b00c54503 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -154,6 +154,14 @@ public class Main {