Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-14 20:10:05 +01:00
Add new TickRateChangedEvent; fires when server tickRate changes
Dieser Commit ist enthalten in:
Axionize
Ursprung
7cd4f2c15f
Commit
b6ee6f52ae
84
patches/api/0495-Add-new-TickRateChangedEvent.patch
Normale Datei
84
patches/api/0495-Add-new-TickRateChangedEvent.patch
Normale Datei
@ -0,0 +1,84 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Axionize <154778082+Axionize@users.noreply.github.com>
|
||||
Date: Tue, 8 Oct 2024 20:38:01 -0400
|
||||
Subject: [PATCH] Add new TickRateChangedEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/server/TickRateChangeEvent.java b/src/main/java/org/bukkit/event/server/TickRateChangeEvent.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..c68ef49ea9fa61b869fce1ba3f73a9272bde2ce7
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/event/server/TickRateChangeEvent.java
|
||||
@@ -0,0 +1,72 @@
|
||||
+package org.bukkit.event.server;
|
||||
+
|
||||
+import com.google.common.base.Preconditions;
|
||||
+import io.papermc.paper.command.brigadier.CommandSourceStack;
|
||||
+import org.bukkit.event.Cancellable;
|
||||
+import org.bukkit.event.HandlerList;
|
||||
+import org.jetbrains.annotations.ApiStatus;
|
||||
+import org.jetbrains.annotations.NotNull;
|
||||
+import org.jetbrains.annotations.Nullable;
|
||||
+import org.jspecify.annotations.NullMarked;
|
||||
+
|
||||
+/**
|
||||
+ * Fired when the server's target tickrate changes
|
||||
+ */
|
||||
+@NullMarked
|
||||
+public class TickRateChangeEvent extends ServerEvent implements Cancellable {
|
||||
+
|
||||
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
||||
+
|
||||
+ private final CommandSourceStack commandSourceStack;
|
||||
+ private float tickRate;
|
||||
+ private boolean cancelled;
|
||||
+
|
||||
+ @ApiStatus.Internal
|
||||
+ public TickRateChangeEvent(CommandSourceStack commandSourceStack, float tickRate) {
|
||||
+ this.commandSourceStack = commandSourceStack;
|
||||
+ this.tickRate = tickRate;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * @return {@link io.papermc.paper.command.brigadier.CommandSourceStack} representing source of the /tick rate command
|
||||
+ * Will return null if the tick rate was set by a plugin or setTickRate() was otherwise directly called
|
||||
+ */
|
||||
+ @Nullable
|
||||
+ public CommandSourceStack getCommandSourceStack() {
|
||||
+ return commandSourceStack;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * @return float representing new tick rate of the server between 1.0F and 10,000F
|
||||
+ */
|
||||
+ public float getTickRate() {
|
||||
+ return tickRate;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * @param tickRate float overriding the new tickrate being applied to the server
|
||||
+ */
|
||||
+ public void setTickRate(float tickRate) {
|
||||
+ Preconditions.checkArgument(tickRate >= 1.0F && tickRate <= 10_000.0F, "The given tick rate must not be less than 1.0 or greater than 10,000.0");
|
||||
+ this.tickRate = tickRate;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public @NotNull HandlerList getHandlers() {
|
||||
+ return HANDLER_LIST;
|
||||
+ }
|
||||
+
|
||||
+ public static HandlerList getHandlerList() {
|
||||
+ return HANDLER_LIST;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public boolean isCancelled() {
|
||||
+ return cancelled;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setCancelled(boolean cancel) {
|
||||
+ cancelled = cancel;
|
||||
+ }
|
||||
+}
|
||||
@ -0,0 +1,67 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Axionize <154778082+Axionize@users.noreply.github.com>
|
||||
Date: Tue, 8 Oct 2024 20:32:34 -0400
|
||||
Subject: [PATCH] Fire and handle new cancellable TickRateChangedEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ServerTickRateManager.java b/src/main/java/net/minecraft/server/ServerTickRateManager.java
|
||||
index 37dcf3dc3e50afd85912a7496c828576a38a4e9c..e9198a83de38e5f0fc564f6c6c87c9cdbf1abd67 100644
|
||||
--- a/src/main/java/net/minecraft/server/ServerTickRateManager.java
|
||||
+++ b/src/main/java/net/minecraft/server/ServerTickRateManager.java
|
||||
@@ -121,13 +121,19 @@ public class ServerTickRateManager extends TickRateManager {
|
||||
this.sprintTimeSpend += System.nanoTime() - this.sprintTickStartTime;
|
||||
}
|
||||
|
||||
- @Override
|
||||
- public void setTickRate(float tickRate) {
|
||||
+ // Paper start - Fire and handle cancellable TickRateChangeEvent
|
||||
+ public void setTickRate(io.papermc.paper.command.brigadier.CommandSourceStack commandSourceStack, float tickRate) {
|
||||
super.setTickRate(tickRate);
|
||||
this.server.onTickRateChanged();
|
||||
this.updateStateToClients();
|
||||
}
|
||||
|
||||
+ @Override
|
||||
+ public void setTickRate(float tickRate) {
|
||||
+ setTickRate(null, tickRate);
|
||||
+ }
|
||||
+ // Paper end - Fire and handle cancellable TickRateChangeEvent
|
||||
+
|
||||
public void updateJoiningPlayer(ServerPlayer player) {
|
||||
player.connection.send(ClientboundTickingStatePacket.from(this));
|
||||
player.connection.send(ClientboundTickingStepPacket.from(this));
|
||||
diff --git a/src/main/java/net/minecraft/server/commands/TickCommand.java b/src/main/java/net/minecraft/server/commands/TickCommand.java
|
||||
index 5ce845a9cd84c355e2716dfcb0b62686c783c9f9..4de4b27ec563a9b37de4355374a1ff45fa8bd551 100644
|
||||
--- a/src/main/java/net/minecraft/server/commands/TickCommand.java
|
||||
+++ b/src/main/java/net/minecraft/server/commands/TickCommand.java
|
||||
@@ -61,7 +61,12 @@ public class TickCommand {
|
||||
|
||||
private static int setTickingRate(CommandSourceStack source, float rate) {
|
||||
ServerTickRateManager serverTickRateManager = source.getServer().tickRateManager();
|
||||
- serverTickRateManager.setTickRate(rate);
|
||||
+ org.bukkit.event.server.TickRateChangeEvent event = new org.bukkit.event.server.TickRateChangeEvent(source, rate);
|
||||
+ if (!event.callEvent()) {
|
||||
+ return(int)rate;
|
||||
+ }
|
||||
+ rate = event.getTickRate();
|
||||
+ serverTickRateManager.setTickRate(source, rate); // Paper - Fire and handle cancellable TickRateChangeEvent
|
||||
String string = String.format("%.1f", rate);
|
||||
source.sendSuccess(() -> Component.translatable("commands.tick.rate.success", string), true);
|
||||
return (int)rate;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServerTickManager.java b/src/main/java/org/bukkit/craftbukkit/CraftServerTickManager.java
|
||||
index cdc55d0703d8ea2d3f6e315f598ebc0afec6fd2d..5d87144b2ea8a996cfcd2056e68ec386d52e4488 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServerTickManager.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServerTickManager.java
|
||||
@@ -42,7 +42,11 @@ final class CraftServerTickManager implements ServerTickManager {
|
||||
@Override
|
||||
public void setTickRate(final float tickRate) {
|
||||
Preconditions.checkArgument(tickRate >= 1.0F && tickRate <= 10_000.0F, "The given tick rate must not be less than 1.0 or greater than 10,000.0");
|
||||
- this.manager.setTickRate(tickRate);
|
||||
+ org.bukkit.event.server.TickRateChangeEvent event = new org.bukkit.event.server.TickRateChangeEvent(null, tickRate);
|
||||
+ if (!event.callEvent()) {
|
||||
+ return;
|
||||
+ }
|
||||
+ this.manager.setTickRate(event.getTickRate());
|
||||
}
|
||||
|
||||
@Override
|
||||
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren