OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit f2854540c2e535fb3e2d89460ee87f0cfa4daca7
Subproject commit 0f9d880f80f374a2e6a88a6bd5ec196a67673ba4

2
CraftBukkit

@ -1 +1 @@
Subproject commit dc0b6f5e82a2bfa521574bfa07cc8b00c486c42e
Subproject commit bc6d8b3353b3ff83d39de840246b25542c71d386

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