Patch rebuild
Dieser Commit ist enthalten in:
Ursprung
7a214c95e6
Commit
232c6f8387
@ -1,14 +1,14 @@
|
|||||||
From ad61749115b51850cd39c8087509435f1c146333 Mon Sep 17 00:00:00 2001
|
From 99c6ce073c851ec4bd0a8d8243b4f2ad6eefcd0f 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 284c776..d4ac60e 100644
|
index 97631e6..9732b47 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
|
||||||
@@ -640,7 +640,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
@@ -641,7 +641,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;
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
From 736c3c56bbfe94414bc4c17d6e44e74c2d2e9955 Mon Sep 17 00:00:00 2001
|
From 7dc6789833b6c98f36cf6a54fe28ee09235f69aa Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 6 Nov 2014 18:29:20 -0600
|
Date: Thu, 6 Nov 2014 18:29:20 -0600
|
||||||
Subject: [PATCH] Add async chunk load API
|
Subject: [PATCH] Add async chunk load API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index 2bbe104..d8401c4 100644
|
index db0697b..dc45452 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -120,6 +120,24 @@ public class CraftWorld implements World {
|
@@ -121,6 +121,24 @@ public class CraftWorld implements World {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -34,5 +34,5 @@ index 2bbe104..d8401c4 100644
|
|||||||
return this.world.chunkProviderServer.getChunkAt(x, z).bukkitChunk;
|
return this.world.chunkProviderServer.getChunkAt(x, z).bukkitChunk;
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
1.9.1
|
2.3.5
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 519f0b747ea7168c9ddf33d305f62799f5c7297a Mon Sep 17 00:00:00 2001
|
From 57df7afdb750579f89a432f684d0cdb1556e6dc8 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 8 Mar 2015 04:23:41 -0500
|
Date: Sun, 8 Mar 2015 04:23:41 -0500
|
||||||
Subject: [PATCH] Add TNT source location API
|
Subject: [PATCH] Add TNT source location API
|
||||||
@ -98,10 +98,10 @@ index 50423eb..1daba4e 100644
|
|||||||
|
|
||||||
public EntityLiving getSource() {
|
public EntityLiving getSource() {
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index d8401c4..6ee6889 100644
|
index dc45452..6b5800e 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -1096,7 +1096,8 @@ public class CraftWorld implements World {
|
@@ -1112,7 +1112,8 @@ public class CraftWorld implements World {
|
||||||
throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location);
|
throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location);
|
||||||
}
|
}
|
||||||
} else if (TNTPrimed.class.isAssignableFrom(clazz)) {
|
} else if (TNTPrimed.class.isAssignableFrom(clazz)) {
|
||||||
@ -128,5 +128,5 @@ index e08ad47..b7e8b4d 100644
|
|||||||
+ // PaperSpigot end
|
+ // PaperSpigot end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
1.9.1
|
2.3.5
|
||||||
|
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren