Upstream - Classloader changes and interact limiter changes

This commit is contained in:
Zach Brown 2014-07-16 14:11:44 -05:00
parent 2f607fbb69
commit c23377d321
3 changed files with 5 additions and 5 deletions

2
Bukkit

@ -1 +1 @@
Subproject commit d30cb63000a8d49f5afd9ff064631bc3ec507e0a
Subproject commit 6ce9a7d98672b26146e2b2d4fd7dc79f3d2ca283

@ -1 +1 @@
Subproject commit 426f936d0733eaf14540e1d74b0ef7b7d802c2aa
Subproject commit c9f320907d8c9649f5f2b33d8a6c37036f318ca9

View File

@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 11 Jul 2014 08:17:00 -0500
Date: Wed, 16 Jul 2014 14:11:08 -0500
Subject: [PATCH] Toggle for player interact limiter
@ -21,8 +21,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public void a(PacketPlayInBlockPlace packetplayinblockplace) {
boolean throttled = false;
- if (lastPlace != -1 && MinecraftServer.currentTick - lastPlace < 1) {
+ if (lastPlace != -1 && MinecraftServer.currentTick - lastPlace < 1 && PaperSpigotConfig.interactLimitEnabled) { // PaperSpigot - Allow interact limit to be disabled
- if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 5) {
+ if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 5 && PaperSpigotConfig.interactLimitEnabled) {
throttled = true;
} else
{