mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-21 15:59:33 +00:00
134 lines
7.0 KiB
Diff
134 lines
7.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Sun, 11 Dec 2022 18:43:35 +0800
|
|
Subject: [PATCH] Player operation limiter
|
|
|
|
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
index 5922236bc6c69a8266144435e665861a657778ac..d8f0e6f64a28df720306f6b77d78cfabfba4ffe9 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -282,6 +282,10 @@ public class ServerPlayer extends Player {
|
|
public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
|
|
public @Nullable String clientBrandName = null; // Paper - Brand name
|
|
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
|
|
+ // Leaves start - player operation limiter
|
|
+ private int instaBreakCountPerTick = 0;
|
|
+ private int placeBlockCountPerTick = 0;
|
|
+ // Leaves end - player operation limiter
|
|
|
|
// Paper start - replace player chunk loader
|
|
private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
|
|
@@ -723,6 +727,7 @@ public class ServerPlayer extends Player {
|
|
this.joining = false;
|
|
}
|
|
// CraftBukkit end
|
|
+ this.resetOperationCountPerTick(); // Leaves - player operation limiter
|
|
this.gameMode.tick();
|
|
this.wardenSpawnTracker.tick();
|
|
--this.spawnInvulnerableTime;
|
|
@@ -2766,5 +2771,32 @@ public class ServerPlayer extends Player {
|
|
public CraftPlayer getBukkitEntity() {
|
|
return (CraftPlayer) super.getBukkitEntity();
|
|
}
|
|
+
|
|
+ // Leaves start - player operation limiter
|
|
+ private void resetOperationCountPerTick() {
|
|
+ instaBreakCountPerTick = 0;
|
|
+ placeBlockCountPerTick = 0;
|
|
+ }
|
|
+
|
|
+ public int getInstaBreakCountPerTick() {
|
|
+ return instaBreakCountPerTick;
|
|
+ }
|
|
+
|
|
+ public int getPlaceBlockCountPerTick() {
|
|
+ return placeBlockCountPerTick;
|
|
+ }
|
|
+
|
|
+ public void addInstaBreakCountPerTick() {
|
|
+ ++instaBreakCountPerTick;
|
|
+ }
|
|
+
|
|
+ public void addPlaceBlockCountPerTick() {
|
|
+ ++placeBlockCountPerTick;
|
|
+ }
|
|
+
|
|
+ public boolean allowOperation() {
|
|
+ return (instaBreakCountPerTick == 0 || placeBlockCountPerTick == 0) && (instaBreakCountPerTick <= 1 && placeBlockCountPerTick <= 2);
|
|
+ }
|
|
+ // Leaves end - player operation limiter
|
|
// CraftBukkit end
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
|
index 58f972832c39a27a8ccd606f9144e1c54adbf6f3..b2aae4463f2d0fc6ae03bbb9a63c5b8f08d67d43 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
|
@@ -44,6 +44,7 @@ import org.bukkit.event.Event;
|
|
import org.bukkit.event.block.Action;
|
|
import org.bukkit.event.player.PlayerGameModeChangeEvent;
|
|
import org.bukkit.event.player.PlayerInteractEvent;
|
|
+import top.leavesmc.leaves.event.player.PlayerOperationLimitEvent;
|
|
// CraftBukkit end
|
|
|
|
public class ServerPlayerGameMode {
|
|
@@ -331,6 +332,19 @@ public class ServerPlayerGameMode {
|
|
}
|
|
|
|
public void destroyAndAck(BlockPos pos, int sequence, String reason) {
|
|
+ // Leaves start - player operation limiter
|
|
+ if (top.leavesmc.leaves.LeavesConfig.playerOperationLimiter) {
|
|
+ if (reason.equals("insta mine")) {
|
|
+ player.addInstaBreakCountPerTick();
|
|
+ if (!player.allowOperation()) {
|
|
+ MinecraftServer.getServer().server.getPluginManager().callEvent(new PlayerOperationLimitEvent(player.getBukkitEntity(), PlayerOperationLimitEvent.Operation.MINE, CraftBlock.at(level, pos)));
|
|
+ this.player.connection.send(new ClientboundBlockUpdatePacket(pos, this.level.getBlockState(pos)));
|
|
+ this.debugLogging(pos, false, sequence, reason);
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // Leaves end - player operation limiter
|
|
if (this.destroyBlock(pos)) {
|
|
this.debugLogging(pos, true, sequence, reason);
|
|
} else {
|
|
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
|
|
index f7e5f3e43714ac74d99f13e59868f43bf791f96d..ef484b74c8e3eedba18978534b70b396810880f8 100644
|
|
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
|
|
@@ -32,9 +32,12 @@ import net.minecraft.world.level.block.state.StateDefinition;
|
|
import net.minecraft.world.level.block.state.properties.Property;
|
|
import net.minecraft.world.level.gameevent.GameEvent;
|
|
import net.minecraft.world.phys.shapes.CollisionContext;
|
|
+import org.bukkit.craftbukkit.CraftServer;
|
|
import org.bukkit.craftbukkit.block.CraftBlock;
|
|
+import org.bukkit.craftbukkit.block.CraftBlockState;
|
|
import org.bukkit.craftbukkit.block.data.CraftBlockData;
|
|
import org.bukkit.event.block.BlockCanBuildEvent;
|
|
+import top.leavesmc.leaves.event.player.PlayerOperationLimitEvent;
|
|
// CraftBukkit end
|
|
|
|
public class BlockItem extends Item {
|
|
@@ -83,6 +86,20 @@ public class BlockItem extends Item {
|
|
final org.bukkit.block.BlockState oldBlockstate = blockstate != null ? blockstate : org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(blockactioncontext1.getLevel(), blockactioncontext1.getClickedPos()); // Paper
|
|
// CraftBukkit end
|
|
|
|
+ // Leaves start - player operation limiter
|
|
+ if (top.leavesmc.leaves.LeavesConfig.playerOperationLimiter && !context.getLevel().isClientSide()) {
|
|
+ ServerPlayer player = (ServerPlayer) context.getPlayer();
|
|
+ if (player != null && iblockdata != null) {
|
|
+ player.addPlaceBlockCountPerTick();
|
|
+ if (!player.allowOperation()) {
|
|
+ if (blockstate != null) {
|
|
+ MinecraftServer.getServer().server.getPluginManager().callEvent(new PlayerOperationLimitEvent(player.getBukkitEntity(), PlayerOperationLimitEvent.Operation.PLACE, blockstate.getBlock()));
|
|
+ }
|
|
+ return InteractionResult.FAIL;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // Leaves end - player operation limiter
|
|
if (iblockdata == null) {
|
|
return InteractionResult.FAIL;
|
|
} else if (!this.placeBlock(blockactioncontext1, iblockdata)) {
|