mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upstream - Classloader changes and interact limiter changes

Browse source
This commit is contained in:
Zach Brown 2014-07-16 14:11:44 -05:00
parent a9283a2d0a
commit b2ec959ec7
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Bukkit

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

2
CraftBukkit

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

10
CraftBukkit-Patches/0020-Toggle-for-player-interact-limiter.patch
View file

@ -1,11 +1,11 @@
From 0bb13c80b9f334ae95fcaf0cd66aaef7143c884c Mon Sep 17 00:00:00 2001 From 89d24e2d915b377efa206cdbca29a7e7d6c23c6f Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com> From: Zach Brown <Zbob750@live.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 Subject: [PATCH] Toggle for player interact limiter
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4f7da33..1657c7c 100644 index 9a7b256..dd63b9f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -59,6 +59,8 @@ import org.bukkit.inventory.InventoryView; @@ -59,6 +59,8 @@ import org.bukkit.inventory.InventoryView;
@ -21,8 +21,8 @@ index 4f7da33..1657c7c 100644
public void a(PacketPlayInBlockPlace packetplayinblockplace) { public void a(PacketPlayInBlockPlace packetplayinblockplace) {
boolean throttled = false; boolean throttled = false;
- if (lastPlace != -1 && MinecraftServer.currentTick - lastPlace < 1) { - if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 5) {
+ if (lastPlace != -1 && MinecraftServer.currentTick - lastPlace < 1 && PaperSpigotConfig.interactLimitEnabled) { // PaperSpigot - Allow interact limit to be disabled + if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 5 && PaperSpigotConfig.interactLimitEnabled) {
throttled = true; throttled = true;
} else } else
{ {