4a430b2238
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@171ba7c Move Log4j plugins to own source set (#9428) PaperMC/Paper@4356758 Call missing BlockDispenseEvents (#8518) PaperMC/Paper@c0936a7 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440) PaperMC/Paper@12c9700 Fix ThrownEggHatchEvent#setHatching (#9448) PaperMC/Paper@dadd8b5 Don't allow for supporting block checks to load chunks PaperMC/Paper@48ea66e Optimize player lookups for beacons PaperMC/Paper@d7d3f63 Use Nullable annotation for Entity source (#9435) PaperMC/Paper@e105354 Fix incorrect new blockdata in EntityChangeBlockEvent (#9445) PaperMC/Paper@5de0f8a Add Sign#getInteractableSideFor (#9388) PaperMC/Paper@6b325cd Array backed synched entity data (#9460) PaperMC/Paper@805fdd8 Add deprecations to SignSide string methods (#9467) PaperMC/Paper@b3dc7a3 fix item meta for tadpole buckets (#9473) PaperMC/Paper@f9473d9 Add gradle wrapper validation action PaperMC/Paper@a3c760e Handle block state in EntityDamageByBlockEvent (#9396) PaperMC/Paper@a60eeb8 Fix mob breaking doors not spawning particles (#9443) PaperMC/Paper@1f8ca77 Prevent desync for poi and pistons (#9270) PaperMC/Paper@92bc19b Fix missing item interaction cancelling case (#9427) PaperMC/Paper@836586d Fix missing item types in SlotType for armor change event (#9379) PaperMC/Paper@ece4fd3 Suppress Item Meta Validation Checks (#9331) PaperMC/Paper@aefb73c Add Owner UUID api for AreaEffectCloud (#9364) PaperMC/Paper@22ed60c Fix BanList API (#9450) PaperMC/Paper@de3f149 Fix possible NPE on painting creation (#9391) PaperMC/Paper@fe780d0 Add back accidentally dropped Wandering Trader patch (#9492) PaperMC/Paper@b533905 fix 2 vanilla issues (#8940) PaperMC/Paper@c793bd9 Allow LEFT_CLICK_AIR in 3.0->4.5 range of entity (#9211)
48 lines
3.5 KiB
Diff
48 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Blast-MC <cjblanton2@gmail.com>
|
|
Date: Mon, 25 Jul 2022 09:11:13 -0400
|
|
Subject: [PATCH] Add spam bypass permission
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index 316740b2ba4c85828f544249c8cdd6fa1b525d3f..d4709622887c2a0c2aa750cf604ce7f122ed62f3 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -882,6 +882,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
|
public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) {
|
|
// PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async
|
|
// CraftBukkit start
|
|
+ if (!this.getCraftPlayer().hasPermission("spam.bypass")) { // Parchment - spam bypass
|
|
if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
|
|
server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause
|
|
return;
|
|
@@ -892,6 +893,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
|
server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper
|
|
return;
|
|
}
|
|
+ } // Parchment - spam bypass
|
|
// Paper end
|
|
// CraftBukkit end
|
|
// Paper start - Don't suggest if tab-complete is disabled
|
|
@@ -2566,6 +2568,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
|
|
|
// Spigot start - spam exclusions
|
|
private void detectRateSpam(String s) {
|
|
+ if (this.getCraftPlayer().hasPermission("spam.bypass")) return; // Parchment - spam bypass
|
|
// CraftBukkit start - replaced with thread safe throttle
|
|
boolean counted = true;
|
|
for ( String exclude : org.spigotmc.SpigotConfig.spamExclusions )
|
|
@@ -3295,10 +3298,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
|
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
|
|
// Paper start
|
|
if (!org.bukkit.Bukkit.isPrimaryThread()) {
|
|
+ if (!this.getCraftPlayer().hasPermission("spam.bypass")) { // Parchment - spam bypass
|
|
if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
|
|
this.server.scheduleOnMain(() -> this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause
|
|
return;
|
|
}
|
|
+ } // Parchment - spam bypass
|
|
}
|
|
// Paper end
|
|
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
|