Update upstream and rebuild patches
This commit is contained in:
parent
b6be4076a3
commit
fdf80f055f
4 changed files with 10 additions and 10 deletions
2
Bukkit
2
Bukkit
|
@ -1 +1 @@
|
|||
Subproject commit 0c042936d8219121ae44d93c4fe0071ce7a9b50a
|
||||
Subproject commit 032d1ff804d2a123e1a10d1917ba4c955a910e1e
|
|
@ -1 +1 @@
|
|||
Subproject commit 7d330bc9f363162bb8c0f6f829f53dc4b7d3de8e
|
||||
Subproject commit 1fefbf9b988be4173df80888d1928418243efec8
|
|
@ -1,4 +1,4 @@
|
|||
From a595984e22203c305cc110aa23357e6afb0a91ee Mon Sep 17 00:00:00 2001
|
||||
From 044e45972d2ced451ccd807d63e04b33a2b93af3 Mon Sep 17 00:00:00 2001
|
||||
From: gsand <gsandowns@gmail.com>
|
||||
Date: Tue, 1 Mar 2016 13:43:16 -0600
|
||||
Subject: [PATCH] Player Exhaustion Multipliers
|
||||
|
@ -36,10 +36,10 @@ index 1d2f580..bed5577 100644
|
|||
ItemStack itemstack1 = this.u(iblockdata);
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index 1ad18f4..7b7025f 100644
|
||||
index 11fdee8..d195ef0 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -1448,13 +1448,13 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
@@ -1447,13 +1447,13 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F);
|
||||
if (i > 0) {
|
||||
this.a(StatisticList.q, i);
|
||||
|
@ -56,5 +56,5 @@ index 1ad18f4..7b7025f 100644
|
|||
} else if (this.n_()) {
|
||||
if (d1 > 0.0D) {
|
||||
--
|
||||
2.7.2
|
||||
2.7.2.windows.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From adf94fa7dc3aeb23f2088f168332acbbe9474ba5 Mon Sep 17 00:00:00 2001
|
||||
From 9a7f7867636034d5b3cdf110b9131d88a0245b94 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 3 Mar 2016 01:17:12 -0600
|
||||
Subject: [PATCH] Ensure commands are not ran async
|
||||
|
@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
|
|||
that it is happening so that plugin authors can fix their code to stop executing commands async.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 25d9d85..3a4bcf9 100644
|
||||
index caa404c..d141307 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1229,6 +1229,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||
@@ -1257,6 +1257,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||
}
|
||||
|
||||
if (!async && s.startsWith("/")) {
|
||||
|
@ -82,5 +82,5 @@ index b27d95a..5a24d38 100644
|
|||
return true;
|
||||
}
|
||||
--
|
||||
2.7.2
|
||||
2.7.2.windows.1
|
||||
|
||||
|
|
Loading…
Reference in a new issue