SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream - Don't crash when a skele shoots an item frame

Browse Source
This commit is contained in:
Zach Brown
2014-07-11 08:17:54 -05:00
parent c11efc9fa8
commit 209b9e7259
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

Submodule Bukkit updated: f2854540c2...0f9d880f80

2
CraftBukkit

Submodule CraftBukkit updated: dc0b6f5e82...bc6d8b3353

14
CraftBukkit-Patches/0020-Configurable-interaction-limit-restriction.patch → CraftBukkit-Patches/0020-Toggle-for-player-interact-limiter.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com> From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Thu, 3 Jul 2014 00:53:47 -0500 Date: Fri, 11 Jul 2014 08:17:00 -0500
Subject: [PATCH] Configurable interaction limit restriction 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
@@ -21,8 +21,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public void a(PacketPlayInBlockPlace packetplayinblockplace) { public void a(PacketPlayInBlockPlace packetplayinblockplace) {
boolean throttled = false; boolean throttled = false;
- if (lastPlace != -1 && MinecraftServer.currentTick - lastPlace < 2) { - if (lastPlace != -1 && MinecraftServer.currentTick - lastPlace < 1) {
+ if (lastPlace != -1 && MinecraftServer.currentTick - lastPlace < PaperSpigotConfig.interactLimit) { // PaperSpigot - Configurable interaction limit restriction + if (lastPlace != -1 && MinecraftServer.currentTick - lastPlace < 1 && PaperSpigotConfig.interactLimitEnabled) { // PaperSpigot - Allow interact limit to be disabled
throttled = true; throttled = true;
} else } else
{ {
@@ -35,10 +35,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
} }
+ +
+ public static int interactLimit; + public static boolean interactLimitEnabled;
+ private static void interactLimit() + private static void interactLimitEnabled()
+ { + {
+ interactLimit = getInt( "settings.player-interaction-limit", 2 ); + interactLimitEnabled = getBoolean( "settings.limit-player-interactions", true );
+ } + }
} }
-- --