Rebuild a patch for an upstream merge
This commit is contained in:
parent
943a2a3782
commit
6c710c1692
1 changed files with 4 additions and 4 deletions
|
@ -1,14 +1,14 @@
|
||||||
From db1b915f951ff35bab79eaf4791d064c2323c0ad Mon Sep 17 00:00:00 2001
|
From 3f91d9981a23c8842f7102035900b7944af4afc9 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Sat, 7 Mar 2015 21:07:10 -0600
|
Date: Sat, 7 Mar 2015 21:07:10 -0600
|
||||||
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 5f3884a..efd6241 100644
|
index 3108938..0c8dda6 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
|
||||||
@@ -636,7 +636,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
@@ -642,7 +642,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||||
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u());
|
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u());
|
||||||
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
|
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
|
||||||
boolean throttled = false;
|
boolean throttled = false;
|
||||||
|
@ -38,5 +38,5 @@ index bff794a..02c4004 100644
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
1.9.1
|
2.3.5
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue