Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-29 09:30:07 +01:00
Update Paper to MC 1.11.1
Dieser Commit ist enthalten in:
Ursprung
f4ea1998ee
Commit
33163525f3
Spigot-API-Patches
0001-POM-changes.patch0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch0017-Player-Tab-List-and-Title-APIs.patch0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch0022-Complete-resource-pack-API.patch0026-Add-command-to-reload-permissions.yml-and-require-co.patch0033-Add-getEntity-by-UUID-API.patch0039-Add-EntityZapEvent.patch0039-Add-debug-logging-to-Timings-enable-setter.patch0040-Misc-Utils.patch0041-Allow-Reloading-of-Command-Aliases.patch0042-Add-source-to-PlayerExpChangeEvent.patch0043-Add-ProjectileCollideEvent.patch0044-Add-String-based-Action-Bar-API.patch
Spigot-Server-Patches
0001-POM-Changes.patch0004-MC-Utils.patch0005-Timings-v2.patch0009-Configurable-fishing-time-ranges.patch0016-Player-affects-spawning-API.patch0023-Entity-Origin-API.patch0024-Prevent-tile-entity-and-entity-crashes.patch0025-Configurable-top-of-nether-void-damage.patch0026-Check-online-mode-before-converting-and-renaming-pla.patch0029-Configurable-end-credits.patch0040-Configurable-mob-spawner-tick-rate.patch0043-Configurable-container-update-tick-rate.patch0045-Disable-spigot-tick-limiters.patch0050-Ensure-commands-are-not-ran-async.patch0056-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch0056-Player-Tab-List-and-Title-APIs.patch0057-Ensure-inv-drag-is-in-bounds.patch0058-Change-implementation-of-tile-entity-removal-list.patch0059-Add-configurable-portal-search-radius.patch0060-Add-velocity-warnings.patch0061-Fix-inter-world-teleportation-glitches.patch0062-Add-exception-reporting-event.patch0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch0064-Disable-Scoreboards-for-non-players-by-default.patch0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch0066-Complete-resource-pack-API.patch0067-Chunk-save-queue-improvements.patch0068-Chunk-Save-Reattempt.patch0069-Default-loading-permissions.yml-before-plugins.patch0070-Allow-Reloading-of-Custom-Permissions.patch0071-Remove-Metadata-on-reload.patch0072-Undead-horse-leashing.patch0073-Fix-Furnace-cook-time-bug.patch0074-Handle-Item-Meta-Inconsistencies.patch0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch0076-Add-World-Util-Methods.patch0077-Optimized-Light-Level-Comparisons.patch0078-Pass-world-to-Village-creation.patch0079-Custom-replacement-for-eaten-items.patch0080-Set-health-before-death-event.patch0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch0082-Catch-Async-PlayerChunkMap-operations.patch0083-Support-offline-mode-in-whitelist-command-as-well.patch0084-Fix-SkullCache-case-bug.patch0085-Waving-banner-workaround.patch0086-Use-a-Shared-Random-for-Entities.patch0087-Don-t-teleport-dead-entities.patch0088-Optimize-Chunk-Access.patch0089-Configurable-spawn-chances-for-skeleton-horses.patch0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch0091-Fix-cooked-fish-legacy-import.patch0092-Access-items-by-EquipmentSlot.patch0093-Check-async-remove-unused-vars-GH-159.patch0093-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch0095-Entity-AddTo-RemoveFrom-World-Events.patch0096-Configurable-Chunk-Inhabited-Timer.patch0097-EntityPathfindEvent.patch0098-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch0099-Reduce-IO-ops-opening-a-new-region-file.patch0100-Sanitise-RegionFileCache-and-make-configurable.patch0101-Add-getEntity-by-UUID-API.patch0102-Use-Optimized-Collections.patch0103-Do-not-load-chunks-for-light-checks.patch0104-Add-PlayerUseUnknownEntityEvent.patch0105-Fix-reducedDebugInfo-not-initialized-on-client.patch0106-Configurable-Grass-Spread-Tick-Rate.patch0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch0108-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch0110-Remove-Debug-checks-from-DataBits.patch0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch0112-Workaround-for-setting-passengers-on-players.patch0113-Remove-unused-World-Tile-Entity-List.patch0114-Don-t-tick-Skulls-unused-code.patch0115-Configurable-Player-Collision.patch0116-Add-handshake-event-to-allow-plugins-to-handle-clien.patch0117-Water-mobs-should-only-spawn-in-the-water.patch0118-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch0119-Configurable-RCON-IP-address.patch0120-Prevent-Fire-from-loading-chunks.patch0121-Implement-PlayerLocaleChangeEvent.patch0122-EntityRegainHealthEvent-isFastRegen-API.patch0123-Add-ability-to-configure-frosted_ice-properties.patch0124-Vehicle-Event-Cancellation-Changes.patch0125-Arrow-pickup-rule-API.patch
@ -1,11 +1,11 @@
|
|||||||
From 9576b81c87a4dfb2e3f672f6435779e65468e671 Mon Sep 17 00:00:00 2001
|
From 75d4b845b027f8df6561282a96dd6ede8c272b2f Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Mon, 29 Feb 2016 17:16:08 -0600
|
Date: Mon, 29 Feb 2016 17:16:08 -0600
|
||||||
Subject: [PATCH] POM changes
|
Subject: [PATCH] POM changes
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 4b788b0..20159ad 100644
|
index 65839cb..c32903b 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -4,35 +4,37 @@
|
@@ -4,35 +4,37 @@
|
||||||
@ -24,7 +24,7 @@ index 4b788b0..20159ad 100644
|
|||||||
- <artifactId>spigot-api</artifactId>
|
- <artifactId>spigot-api</artifactId>
|
||||||
+ <groupId>com.destroystokyo.paper</groupId>
|
+ <groupId>com.destroystokyo.paper</groupId>
|
||||||
+ <artifactId>paper-api</artifactId>
|
+ <artifactId>paper-api</artifactId>
|
||||||
<version>1.11-R0.1-SNAPSHOT</version>
|
<version>1.11.1-R0.1-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
- <name>Spigot-API</name>
|
- <name>Spigot-API</name>
|
||||||
@ -133,5 +133,5 @@ index 4b788b0..20159ad 100644
|
|||||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
<shadedArtifactAttached>true</shadedArtifactAttached>
|
||||||
</configuration>
|
</configuration>
|
||||||
--
|
--
|
||||||
2.10.2
|
2.9.3
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 1fd8e7ad43cd1fd7602774dc31d963d1078406c6 Mon Sep 17 00:00:00 2001
|
From ec0213d43bbad628561225629bda86b4cd9dc489 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Mon, 29 Feb 2016 19:54:32 -0600
|
Date: Mon, 29 Feb 2016 19:54:32 -0600
|
||||||
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
||||||
@ -37,10 +37,10 @@ index 9b310d8..87648ae 100644
|
|||||||
* Gets the name of the update folder. The update folder is used to safely
|
* Gets the name of the update folder. The update folder is used to safely
|
||||||
* update plugins at the right moment on a plugin load.
|
* update plugins at the right moment on a plugin load.
|
||||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||||
index eea7239..6c2366b 100644
|
index eea7239..915d8a5 100644
|
||||||
--- a/src/main/java/org/bukkit/Server.java
|
--- a/src/main/java/org/bukkit/Server.java
|
||||||
+++ b/src/main/java/org/bukkit/Server.java
|
+++ b/src/main/java/org/bukkit/Server.java
|
||||||
@@ -239,6 +239,22 @@ public interface Server extends PluginMessageRecipient {
|
@@ -239,6 +239,26 @@ public interface Server extends PluginMessageRecipient {
|
||||||
*/
|
*/
|
||||||
public int broadcastMessage(String message);
|
public int broadcastMessage(String message);
|
||||||
|
|
||||||
@ -50,24 +50,28 @@ index eea7239..6c2366b 100644
|
|||||||
+ *
|
+ *
|
||||||
+ * @param component the component to send
|
+ * @param component the component to send
|
||||||
+ */
|
+ */
|
||||||
+ public void broadcast(net.md_5.bungee.api.chat.BaseComponent component);
|
+ public default void broadcast(net.md_5.bungee.api.chat.BaseComponent component) {
|
||||||
|
+ spigot().broadcast(component);
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Sends an array of components as a single message to all online players.
|
+ * Sends an array of components as a single message to all online players.
|
||||||
+ *
|
+ *
|
||||||
+ * @param components the components to send
|
+ * @param components the components to send
|
||||||
+ */
|
+ */
|
||||||
+ public void broadcast(net.md_5.bungee.api.chat.BaseComponent... components);
|
+ public default void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||||
|
+ spigot().broadcast(components);
|
||||||
|
+ }
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
+
|
+
|
||||||
/**
|
/**
|
||||||
* Gets the name of the update folder. The update folder is used to safely
|
* Gets the name of the update folder. The update folder is used to safely
|
||||||
* update plugins at the right moment on a plugin load.
|
* update plugins at the right moment on a plugin load.
|
||||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||||
index bca09f0..3295674 100644
|
index ebe727a..5f74d9d 100644
|
||||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
@@ -390,6 +390,30 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
@@ -390,6 +390,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||||
*/
|
*/
|
||||||
public void sendMap(MapView map);
|
public void sendMap(MapView map);
|
||||||
|
|
||||||
@ -77,14 +81,18 @@ index bca09f0..3295674 100644
|
|||||||
+ *
|
+ *
|
||||||
+ * @param component the components to send
|
+ * @param component the components to send
|
||||||
+ */
|
+ */
|
||||||
+ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component);
|
+ public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
|
||||||
|
+ spigot().sendMessage(component);
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Sends an array of components as a single message to the player
|
+ * Sends an array of components as a single message to the player
|
||||||
+ *
|
+ *
|
||||||
+ * @param components the components to send
|
+ * @param components the components to send
|
||||||
+ */
|
+ */
|
||||||
+ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components);
|
+ public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||||
|
+ spigot().sendMessage(components);
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Sends an array of components as a single message to the specified screen position of this player
|
+ * Sends an array of components as a single message to the specified screen position of this player
|
||||||
@ -92,12 +100,14 @@ index bca09f0..3295674 100644
|
|||||||
+ * @param position the screen position
|
+ * @param position the screen position
|
||||||
+ * @param components the components to send
|
+ * @param components the components to send
|
||||||
+ */
|
+ */
|
||||||
+ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components);
|
+ public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||||
|
+ spigot().sendMessage(position, components);
|
||||||
|
+ }
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
+
|
+
|
||||||
/**
|
/**
|
||||||
* Forces an update of the player's entire inventory.
|
* Forces an update of the player's entire inventory.
|
||||||
*
|
*
|
||||||
--
|
--
|
||||||
2.10.2
|
2.9.3
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 20302a2aa7ce4804ef279e8c927a6915b7f59a15 Mon Sep 17 00:00:00 2001
|
From fa2d6467d3483f75538099c4ce6cff68bd0a5c93 Mon Sep 17 00:00:00 2001
|
||||||
From: Techcable <Techcable@outlook.com>
|
From: Techcable <Techcable@outlook.com>
|
||||||
Date: Mon, 29 Feb 2016 20:02:40 -0600
|
Date: Mon, 29 Feb 2016 20:02:40 -0600
|
||||||
Subject: [PATCH] Player Tab List and Title APIs
|
Subject: [PATCH] Player Tab List and Title APIs
|
||||||
@ -369,7 +369,7 @@ index 0000000..e1ecd44
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||||
index 27e0f07..50b4fb2 100644
|
index 5f74d9d..8641bb9 100644
|
||||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
@@ -2,6 +2,7 @@ package org.bukkit.entity;
|
@@ -2,6 +2,7 @@ package org.bukkit.entity;
|
||||||
@ -380,10 +380,10 @@ index 27e0f07..50b4fb2 100644
|
|||||||
import org.bukkit.Achievement;
|
import org.bukkit.Achievement;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Effect;
|
import org.bukkit.Effect;
|
||||||
@@ -412,6 +413,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
@@ -418,6 +419,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||||
* @param components the components to send
|
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||||
*/
|
spigot().sendMessage(position, components);
|
||||||
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components);
|
}
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Set the text displayed in the player list header and footer for this player
|
+ * Set the text displayed in the player list header and footer for this player
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From b7c4b62a1912e41a56a29d095248312c8a8f2699 Mon Sep 17 00:00:00 2001
|
From f48b3a42b4d30b888395ba3c184dcd9cf7cfd55c Mon Sep 17 00:00:00 2001
|
||||||
From: kashike <kashike@vq.lc>
|
From: kashike <kashike@vq.lc>
|
||||||
Date: Tue, 8 Mar 2016 13:05:59 -0800
|
Date: Tue, 8 Mar 2016 13:05:59 -0800
|
||||||
Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
|
Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
|
||||||
@ -40,7 +40,7 @@ index 148756b..4ad0028 100644
|
|||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||||
index 9f67d09..5b7ca6a 100644
|
index 8641bb9..0a11a51 100644
|
||||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
@@ -397,6 +397,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
@@ -397,6 +397,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||||
@ -48,17 +48,17 @@ index 9f67d09..5b7ca6a 100644
|
|||||||
* @param component the components to send
|
* @param component the components to send
|
||||||
*/
|
*/
|
||||||
+ @Override
|
+ @Override
|
||||||
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component);
|
public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
|
||||||
|
spigot().sendMessage(component);
|
||||||
/**
|
}
|
||||||
@@ -404,6 +405,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
@@ -406,6 +407,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||||
*
|
*
|
||||||
* @param components the components to send
|
* @param components the components to send
|
||||||
*/
|
*/
|
||||||
+ @Override
|
+ @Override
|
||||||
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components);
|
public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||||
|
spigot().sendMessage(components);
|
||||||
/**
|
}
|
||||||
--
|
--
|
||||||
2.10.2
|
2.9.3
|
||||||
|
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
From 699be1d39a7401d680acf2d47ab0defa3c33a536 Mon Sep 17 00:00:00 2001
|
From 5865959ee46d30a03b7961c997a06ca7f0d022f8 Mon Sep 17 00:00:00 2001
|
||||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
Date: Sat, 4 Apr 2015 22:59:54 -0400
|
Date: Sat, 4 Apr 2015 22:59:54 -0400
|
||||||
Subject: [PATCH] Complete resource pack API
|
Subject: [PATCH] Complete resource pack API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||||
index 1fe4794..bf4c31b 100644
|
index 0a11a51..083e60f 100644
|
||||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
@@ -1166,7 +1166,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
@@ -1172,7 +1172,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||||
* @throws IllegalArgumentException Thrown if the URL is null.
|
* @throws IllegalArgumentException Thrown if the URL is null.
|
||||||
* @throws IllegalArgumentException Thrown if the URL is too long. The
|
* @throws IllegalArgumentException Thrown if the URL is too long. The
|
||||||
* length restriction is an implementation specific arbitrary value.
|
* length restriction is an implementation specific arbitrary value.
|
||||||
@ -18,7 +18,7 @@ index 1fe4794..bf4c31b 100644
|
|||||||
public void setResourcePack(String url);
|
public void setResourcePack(String url);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1509,6 +1511,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
@@ -1515,6 +1517,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||||
*/
|
*/
|
||||||
public void setViewDistance(int viewDistance);
|
public void setViewDistance(int viewDistance);
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 72e6b053e69f99ec47de74886e42b95776a23ede Mon Sep 17 00:00:00 2001
|
From 51b97e731012cb0fefc1a80e3b8805f38e3751fe Mon Sep 17 00:00:00 2001
|
||||||
From: William <admin@domnian.com>
|
From: William <admin@domnian.com>
|
||||||
Date: Fri, 18 Mar 2016 03:28:07 -0400
|
Date: Fri, 18 Mar 2016 03:28:07 -0400
|
||||||
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
|
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
|
||||||
@ -24,10 +24,10 @@ index 87648ae..1e98f39 100644
|
|||||||
|
|
||||||
public static Server.Spigot spigot()
|
public static Server.Spigot spigot()
|
||||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||||
index 6c2366b..33e6080 100644
|
index 915d8a5..1b682b5 100644
|
||||||
--- a/src/main/java/org/bukkit/Server.java
|
--- a/src/main/java/org/bukkit/Server.java
|
||||||
+++ b/src/main/java/org/bukkit/Server.java
|
+++ b/src/main/java/org/bukkit/Server.java
|
||||||
@@ -1011,4 +1011,6 @@ public interface Server extends PluginMessageRecipient {
|
@@ -1015,4 +1015,6 @@ public interface Server extends PluginMessageRecipient {
|
||||||
}
|
}
|
||||||
|
|
||||||
Spigot spigot();
|
Spigot spigot();
|
||||||
@ -105,5 +105,5 @@ index 1302773..9ce0a5d 100644
|
|||||||
+
|
+
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.10.2
|
2.9.3
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 578af17993c01766dadb6c7c005fa42d98a4fb7b Mon Sep 17 00:00:00 2001
|
From d103b8d2293a1ceeb3ac328711f78cffe566098d Mon Sep 17 00:00:00 2001
|
||||||
From: DemonWav <demonwav@gmail.com>
|
From: DemonWav <demonwav@gmail.com>
|
||||||
Date: Wed, 30 Mar 2016 01:19:51 -0500
|
Date: Wed, 30 Mar 2016 01:19:51 -0500
|
||||||
Subject: [PATCH] Add getEntity by UUID API
|
Subject: [PATCH] Add getEntity by UUID API
|
||||||
@ -26,10 +26,10 @@ index 1e98f39..eb6fb2c 100644
|
|||||||
|
|
||||||
public static Server.Spigot spigot()
|
public static Server.Spigot spigot()
|
||||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||||
index 33e6080..0850009 100644
|
index 1b682b5..c2b61f1 100644
|
||||||
--- a/src/main/java/org/bukkit/Server.java
|
--- a/src/main/java/org/bukkit/Server.java
|
||||||
+++ b/src/main/java/org/bukkit/Server.java
|
+++ b/src/main/java/org/bukkit/Server.java
|
||||||
@@ -1013,4 +1013,12 @@ public interface Server extends PluginMessageRecipient {
|
@@ -1017,4 +1017,12 @@ public interface Server extends PluginMessageRecipient {
|
||||||
Spigot spigot();
|
Spigot spigot();
|
||||||
|
|
||||||
void reloadPermissions(); // Paper
|
void reloadPermissions(); // Paper
|
||||||
@ -43,5 +43,5 @@ index 33e6080..0850009 100644
|
|||||||
+ Entity getEntity(UUID uuid); // Paper
|
+ Entity getEntity(UUID uuid); // Paper
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.10.2
|
2.9.3
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 7a5e519b5a40b6210703aded7140542fbfbe9a9d Mon Sep 17 00:00:00 2001
|
From 37aa6e6fb396fb0b13a380e9bba7993f3c7629b7 Mon Sep 17 00:00:00 2001
|
||||||
From: AlphaBlend <whizkid3000@hotmail.com>
|
From: AlphaBlend <whizkid3000@hotmail.com>
|
||||||
Date: Sun, 16 Oct 2016 23:19:34 -0700
|
Date: Sun, 16 Oct 2016 23:19:34 -0700
|
||||||
Subject: [PATCH] Add EntityZapEvent
|
Subject: [PATCH] Add EntityZapEvent
|
||||||
@ -119,5 +119,5 @@ index aa80ebf..73844b8 100644
|
|||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.10.2
|
2.9.3
|
||||||
|
|
@ -1,25 +0,0 @@
|
|||||||
From 4d20b34e3e83e6ed7d517b88c05bc77558641412 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
||||||
Date: Wed, 26 Oct 2016 15:49:28 -0500
|
|
||||||
Subject: [PATCH] Add debug logging to Timings enable setter
|
|
||||||
|
|
||||||
Potentially temporary, will be merged back into main Timings patch if not.
|
|
||||||
`java -Dtimings.throwOnChange=true -jar paperclip.jar`
|
|
||||||
|
|
||||||
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
|
|
||||||
index 4e5cf35..bef7cf7 100644
|
|
||||||
--- a/src/main/java/co/aikar/timings/Timings.java
|
|
||||||
+++ b/src/main/java/co/aikar/timings/Timings.java
|
|
||||||
@@ -128,6 +128,9 @@ public final class Timings {
|
|
||||||
public static void setTimingsEnabled(boolean enabled) {
|
|
||||||
timingsEnabled = enabled;
|
|
||||||
reset();
|
|
||||||
+ if (Boolean.getBoolean("timings.throwOnChange")) {
|
|
||||||
+ new RuntimeException("The enable state of timings has been changed to: " + enabled).printStackTrace();
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 6e4c05b271039c42a798abb3db3d414d50b0111f Mon Sep 17 00:00:00 2001
|
From e8be384aca64a96173cf48b19340a6a92573bbb1 Mon Sep 17 00:00:00 2001
|
||||||
From: vemacs <d@nkmem.es>
|
From: vemacs <d@nkmem.es>
|
||||||
Date: Wed, 23 Nov 2016 12:53:43 -0500
|
Date: Wed, 23 Nov 2016 12:53:43 -0500
|
||||||
Subject: [PATCH] Misc Utils
|
Subject: [PATCH] Misc Utils
|
||||||
@ -42,5 +42,5 @@ index 0000000..d60ecbb
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
--
|
--
|
||||||
2.10.2
|
2.9.3
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 9b519772c330599ddd6a645e9d619ab21ef7d4e0 Mon Sep 17 00:00:00 2001
|
From b315acf6f03fd6fd14a9dfbcff844eae1fbf2d19 Mon Sep 17 00:00:00 2001
|
||||||
From: willies952002 <admin@domnian.com>
|
From: willies952002 <admin@domnian.com>
|
||||||
Date: Mon, 28 Nov 2016 10:16:39 -0500
|
Date: Mon, 28 Nov 2016 10:16:39 -0500
|
||||||
Subject: [PATCH] Allow Reloading of Command Aliases
|
Subject: [PATCH] Allow Reloading of Command Aliases
|
||||||
@ -24,10 +24,10 @@ index eb6fb2c..e16a02c 100644
|
|||||||
|
|
||||||
public static Server.Spigot spigot()
|
public static Server.Spigot spigot()
|
||||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||||
index 0850009..371e62a 100644
|
index c2b61f1..09f3e20 100644
|
||||||
--- a/src/main/java/org/bukkit/Server.java
|
--- a/src/main/java/org/bukkit/Server.java
|
||||||
+++ b/src/main/java/org/bukkit/Server.java
|
+++ b/src/main/java/org/bukkit/Server.java
|
||||||
@@ -1021,4 +1021,6 @@ public interface Server extends PluginMessageRecipient {
|
@@ -1025,4 +1025,6 @@ public interface Server extends PluginMessageRecipient {
|
||||||
* @return The entity that is identified by the given UUID, or null if one isn't found
|
* @return The entity that is identified by the given UUID, or null if one isn't found
|
||||||
*/
|
*/
|
||||||
Entity getEntity(UUID uuid); // Paper
|
Entity getEntity(UUID uuid); // Paper
|
||||||
@ -91,5 +91,5 @@ index 040509c..585bac7 100644
|
|||||||
confirmed = true;
|
confirmed = true;
|
||||||
} else {
|
} else {
|
||||||
--
|
--
|
||||||
2.10.0
|
2.9.3
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From f57d12d51fc55db4fe7c81778e0390d69f62087c Mon Sep 17 00:00:00 2001
|
From ad3832340e806dd7772de4ec8ae594767d2ad294 Mon Sep 17 00:00:00 2001
|
||||||
From: AlphaBlend <whizkid3000@hotmail.com>
|
From: AlphaBlend <whizkid3000@hotmail.com>
|
||||||
Date: Thu, 8 Sep 2016 08:47:08 -0700
|
Date: Thu, 8 Sep 2016 08:47:08 -0700
|
||||||
Subject: [PATCH] Add source to PlayerExpChangeEvent
|
Subject: [PATCH] Add source to PlayerExpChangeEvent
|
||||||
@ -53,5 +53,5 @@ index f37491d..3088255 100644
|
|||||||
*
|
*
|
||||||
* @return The amount of experience
|
* @return The amount of experience
|
||||||
--
|
--
|
||||||
2.10.2
|
2.9.3
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 40cc96eda623cddf95322ad4ca1d0ae665625ba1 Mon Sep 17 00:00:00 2001
|
From 5d1ab8bdc2d9069a20154ef1be9eb8fe3080cc68 Mon Sep 17 00:00:00 2001
|
||||||
From: Techcable <Techcable@outlook.com>
|
From: Techcable <Techcable@outlook.com>
|
||||||
Date: Fri, 16 Dec 2016 21:25:39 -0600
|
Date: Fri, 16 Dec 2016 21:25:39 -0600
|
||||||
Subject: [PATCH] Add ProjectileCollideEvent
|
Subject: [PATCH] Add ProjectileCollideEvent
|
@ -1,11 +1,11 @@
|
|||||||
From 7b2810ce185f4805e505de6701cafb5ef86a5687 Mon Sep 17 00:00:00 2001
|
From 096901560b7ced2820b8f131d8633ccfab953a57 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 20 Dec 2016 15:55:55 -0500
|
Date: Tue, 20 Dec 2016 15:55:55 -0500
|
||||||
Subject: [PATCH] Add String based Action Bar API
|
Subject: [PATCH] Add String based Action Bar API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||||
index bf4c31ba..5c38b3f3 100644
|
index 083e60f..4d577a5 100644
|
||||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
@@ -392,6 +392,12 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
@@ -392,6 +392,12 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||||
@ -22,5 +22,5 @@ index bf4c31ba..5c38b3f3 100644
|
|||||||
* Sends the component to the player
|
* Sends the component to the player
|
||||||
*
|
*
|
||||||
--
|
--
|
||||||
2.11.0
|
2.9.3
|
||||||
|
|
@ -1,11 +1,11 @@
|
|||||||
From 0e7f1c733e810fc4e95da50c1c21214b500ca44e Mon Sep 17 00:00:00 2001
|
From 5369c4021cb5d9ddea75547f5357b4c6ed5e0885 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Mon, 29 Feb 2016 20:40:33 -0600
|
Date: Mon, 29 Feb 2016 20:40:33 -0600
|
||||||
Subject: [PATCH] POM Changes
|
Subject: [PATCH] POM Changes
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index c5fd4d0..2fa1925 100644
|
index 2b0fc8f..4fe3d8c 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -1,12 +1,12 @@
|
@@ -1,12 +1,12 @@
|
||||||
@ -17,7 +17,7 @@ index c5fd4d0..2fa1925 100644
|
|||||||
+ <groupId>com.destroystokyo.paper</groupId>
|
+ <groupId>com.destroystokyo.paper</groupId>
|
||||||
+ <artifactId>paper</artifactId>
|
+ <artifactId>paper</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<version>1.11-R0.1-SNAPSHOT</version>
|
<version>1.11.1-R0.1-SNAPSHOT</version>
|
||||||
- <name>Spigot</name>
|
- <name>Spigot</name>
|
||||||
- <url>http://www.spigotmc.org</url>
|
- <url>http://www.spigotmc.org</url>
|
||||||
+ <name>Paper</name>
|
+ <name>Paper</name>
|
||||||
@ -194,5 +194,5 @@ index 9304637..674096c 100644
|
|||||||
|
|
||||||
if (stream != null) {
|
if (stream != null) {
|
||||||
--
|
--
|
||||||
2.10.2
|
2.9.3
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
From 061f2ed91f27177f156e65fc6762787aeb9616ff Mon Sep 17 00:00:00 2001
|
From 41b25e73b7480b5af82b385e10674d7f21ebbaa3 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 28 Mar 2016 20:55:47 -0400
|
Date: Mon, 28 Mar 2016 20:55:47 -0400
|
||||||
Subject: [PATCH] MC Utils
|
Subject: [PATCH] MC Utils
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
index 4542987..b651edc 100644
|
index b0aba60..81fc04e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
@@ -675,6 +675,7 @@ public class Chunk {
|
@@ -675,6 +675,7 @@ public class Chunk {
|
||||||
@ -222,19 +222,19 @@ index 0000000..fe7b476
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
|
diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
|
||||||
index 154a2d5..b6a20c5 100644
|
index 90d18f4..2a2f53c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/NBTTagCompound.java
|
--- a/src/main/java/net/minecraft/server/NBTTagCompound.java
|
||||||
+++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
|
+++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
|
||||||
@@ -13,7 +13,7 @@ import javax.annotation.Nullable;
|
@@ -19,7 +19,7 @@ import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
public class NBTTagCompound extends NBTBase {
|
public class NBTTagCompound extends NBTBase {
|
||||||
|
|
||||||
|
private static final Logger b = LogManager.getLogger();
|
||||||
- private final Map<String, NBTBase> map = Maps.newHashMap();
|
- private final Map<String, NBTBase> map = Maps.newHashMap();
|
||||||
+ public final Map<String, NBTBase> map = Maps.newHashMap(); // Paper
|
+ public final Map<String, NBTBase> map = Maps.newHashMap(); // Paper
|
||||||
|
|
||||||
public NBTTagCompound() {}
|
public NBTTagCompound() {}
|
||||||
|
|
||||||
@@ -85,11 +85,13 @@ public class NBTTagCompound extends NBTBase {
|
@@ -91,11 +91,13 @@ public class NBTTagCompound extends NBTBase {
|
||||||
this.map.put(s, new NBTTagLong(i));
|
this.map.put(s, new NBTTagLong(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -249,7 +249,7 @@ index 154a2d5..b6a20c5 100644
|
|||||||
public UUID a(String s) {
|
public UUID a(String s) {
|
||||||
return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least"));
|
return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least"));
|
||||||
diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
|
diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
|
||||||
index 13b93a4..ffe2353 100644
|
index 370203b..ae7498c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/NBTTagList.java
|
--- a/src/main/java/net/minecraft/server/NBTTagList.java
|
||||||
+++ b/src/main/java/net/minecraft/server/NBTTagList.java
|
+++ b/src/main/java/net/minecraft/server/NBTTagList.java
|
||||||
@@ -12,7 +12,7 @@ import org.apache.logging.log4j.Logger;
|
@@ -12,7 +12,7 @@ import org.apache.logging.log4j.Logger;
|
||||||
@ -262,5 +262,5 @@ index 13b93a4..ffe2353 100644
|
|||||||
|
|
||||||
public NBTTagList() {}
|
public NBTTagList() {}
|
||||||
--
|
--
|
||||||
2.9.2.windows.1
|
2.9.3
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
From db1d411569fb974810f998de3b9cbe7ab4751961 Mon Sep 17 00:00:00 2001
|
From b886700e69bed39ac24603f4797371680ba0ffab Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 3 Mar 2016 04:00:11 -0600
|
Date: Thu, 3 Mar 2016 04:00:11 -0600
|
||||||
Subject: [PATCH] Timings v2
|
Subject: [PATCH] Timings v2
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 2fa1925..911c0a9 100644
|
index 4fe3d8c..d717dd8 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -66,6 +66,12 @@
|
@@ -66,6 +66,12 @@
|
||||||
@ -425,7 +425,7 @@ index 3d0a005..f509bed 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
||||||
index 9d14403..da86874 100644
|
index e8511ac..d3f1a4a 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Block.java
|
--- a/src/main/java/net/minecraft/server/Block.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||||
@@ -35,6 +35,15 @@ public class Block {
|
@@ -35,6 +35,15 @@ public class Block {
|
||||||
@ -515,7 +515,7 @@ index b39937f..17d39bb 100644
|
|||||||
this.chunkLoader.a(this.world, chunk);
|
this.chunkLoader.a(this.world, chunk);
|
||||||
} catch (IOException ioexception) {
|
} catch (IOException ioexception) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
index 15969b1..ca33899 100644
|
index 69387ea..66d0022 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
@@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
@@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
||||||
@ -555,7 +555,7 @@ index 15969b1..ca33899 100644
|
|||||||
// return chunk; // CraftBukkit
|
// return chunk; // CraftBukkit
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||||
index f01bd35..51d6b3e 100644
|
index c6a8345..363415f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||||
@@ -23,7 +23,7 @@ import java.io.PrintStream;
|
@@ -23,7 +23,7 @@ import java.io.PrintStream;
|
||||||
@ -586,10 +586,10 @@ index f01bd35..51d6b3e 100644
|
|||||||
|
|
||||||
public boolean aa() {
|
public boolean aa() {
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index e148e37..e0276a6 100644
|
index e89dd7b..f86fe82 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace;
|
@@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
|
||||||
import org.bukkit.entity.Hanging;
|
import org.bukkit.entity.Hanging;
|
||||||
import org.bukkit.entity.LivingEntity;
|
import org.bukkit.entity.LivingEntity;
|
||||||
import org.bukkit.entity.Vehicle;
|
import org.bukkit.entity.Vehicle;
|
||||||
@ -599,7 +599,7 @@ index e148e37..e0276a6 100644
|
|||||||
import org.bukkit.event.entity.EntityCombustByEntityEvent;
|
import org.bukkit.event.entity.EntityCombustByEntityEvent;
|
||||||
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
|
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
|
||||||
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
|
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
|
||||||
@@ -142,7 +143,7 @@ public abstract class Entity implements ICommandListener {
|
@@ -145,7 +146,7 @@ public abstract class Entity implements ICommandListener {
|
||||||
public boolean valid; // CraftBukkit
|
public boolean valid; // CraftBukkit
|
||||||
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
|
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
|
||||||
public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
|
public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
|
||||||
@ -608,7 +608,7 @@ index e148e37..e0276a6 100644
|
|||||||
// Spigot start
|
// Spigot start
|
||||||
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
|
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
|
||||||
public final boolean defaultActivationState;
|
public final boolean defaultActivationState;
|
||||||
@@ -471,7 +472,6 @@ public abstract class Entity implements ICommandListener {
|
@@ -475,7 +476,6 @@ public abstract class Entity implements ICommandListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void move(EnumMoveType enummovetype, double d0, double d1, double d2) {
|
public void move(EnumMoveType enummovetype, double d0, double d1, double d2) {
|
||||||
@ -616,7 +616,7 @@ index e148e37..e0276a6 100644
|
|||||||
if (this.noclip) {
|
if (this.noclip) {
|
||||||
this.a(this.getBoundingBox().d(d0, d1, d2));
|
this.a(this.getBoundingBox().d(d0, d1, d2));
|
||||||
this.recalcPosition();
|
this.recalcPosition();
|
||||||
@@ -820,7 +820,6 @@ public abstract class Entity implements ICommandListener {
|
@@ -869,7 +869,6 @@ public abstract class Entity implements ICommandListener {
|
||||||
|
|
||||||
this.world.methodProfiler.b();
|
this.world.methodProfiler.b();
|
||||||
}
|
}
|
||||||
@ -625,7 +625,7 @@ index e148e37..e0276a6 100644
|
|||||||
|
|
||||||
public void recalcPosition() {
|
public void recalcPosition() {
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
index 95b59ba..b328b25 100644
|
index 9a3c573..9c0b889 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
@@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
|
@@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
|
||||||
@ -727,7 +727,7 @@ index 347a2b6..aceb08c 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 0b790ab..81a69e8 100644
|
index 4d3f403..f2b13b3 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -47,7 +47,7 @@ import org.bukkit.Bukkit;
|
@@ -47,7 +47,7 @@ import org.bukkit.Bukkit;
|
||||||
@ -969,7 +969,7 @@ index a5a096b..c546139 100644
|
|||||||
|
|
||||||
}
|
}
|
||||||
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 b583e9a..bc3af9b 100644
|
index ec5d6ea..3330513 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
|
||||||
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
|
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
|
||||||
@ -980,7 +980,7 @@ index b583e9a..bc3af9b 100644
|
|||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||||
@@ -1318,7 +1319,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
@@ -1325,7 +1326,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
private void handleCommand(String s) {
|
private void handleCommand(String s) {
|
||||||
@ -989,7 +989,7 @@ index b583e9a..bc3af9b 100644
|
|||||||
// CraftBukkit start - whole method
|
// CraftBukkit start - whole method
|
||||||
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
|
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
|
||||||
this.LOGGER.info(this.player.getName() + " issued server command: " + s);
|
this.LOGGER.info(this.player.getName() + " issued server command: " + s);
|
||||||
@@ -1329,22 +1330,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
@@ -1336,22 +1337,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||||
this.server.getPluginManager().callEvent(event);
|
this.server.getPluginManager().callEvent(event);
|
||||||
|
|
||||||
if (event.isCancelled()) {
|
if (event.isCancelled()) {
|
||||||
@ -1017,7 +1017,7 @@ index b583e9a..bc3af9b 100644
|
|||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
index 5359e8c..04d6355 100644
|
index 7be0135..9f52995 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,5 +1,6 @@
|
||||||
@ -1027,7 +1027,7 @@ index 5359e8c..04d6355 100644
|
|||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import com.google.common.collect.Sets;
|
import com.google.common.collect.Sets;
|
||||||
@@ -1179,10 +1180,11 @@ public abstract class PlayerList {
|
@@ -1172,10 +1173,11 @@ public abstract class PlayerList {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void savePlayers() {
|
public void savePlayers() {
|
||||||
@ -1083,7 +1083,7 @@ index f1f2065..fb350c4 100644
|
|||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
||||||
index 8d54eb3..0f505ed 100644
|
index 6958a2e..b3d3df4 100644
|
||||||
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
||||||
@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
|
@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
|
||||||
@ -1103,7 +1103,7 @@ index 8d54eb3..0f505ed 100644
|
|||||||
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
|
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
|
||||||
protected World world;
|
protected World world;
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 6ba7bbb..c058aa4 100644
|
index dcd6fc1..f694bf5 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
|
@@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
|
||||||
@ -1137,7 +1137,7 @@ index 6ba7bbb..c058aa4 100644
|
|||||||
this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
|
this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
|
||||||
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
|
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
|
||||||
}
|
}
|
||||||
@@ -1403,6 +1403,7 @@ public abstract class World implements IBlockAccess {
|
@@ -1382,6 +1382,7 @@ public abstract class World implements IBlockAccess {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.methodProfiler.c("remove");
|
this.methodProfiler.c("remove");
|
||||||
@ -1145,7 +1145,7 @@ index 6ba7bbb..c058aa4 100644
|
|||||||
this.entityList.removeAll(this.f);
|
this.entityList.removeAll(this.f);
|
||||||
|
|
||||||
int j;
|
int j;
|
||||||
@@ -1423,6 +1424,7 @@ public abstract class World implements IBlockAccess {
|
@@ -1402,6 +1403,7 @@ public abstract class World implements IBlockAccess {
|
||||||
|
|
||||||
this.f.clear();
|
this.f.clear();
|
||||||
this.l();
|
this.l();
|
||||||
@ -1153,7 +1153,7 @@ index 6ba7bbb..c058aa4 100644
|
|||||||
this.methodProfiler.c("regular");
|
this.methodProfiler.c("regular");
|
||||||
|
|
||||||
CrashReportSystemDetails crashreportsystemdetails1;
|
CrashReportSystemDetails crashreportsystemdetails1;
|
||||||
@@ -1432,6 +1434,7 @@ public abstract class World implements IBlockAccess {
|
@@ -1411,6 +1413,7 @@ public abstract class World implements IBlockAccess {
|
||||||
timings.entityTick.startTiming(); // Spigot
|
timings.entityTick.startTiming(); // Spigot
|
||||||
guardEntityList = true; // Spigot
|
guardEntityList = true; // Spigot
|
||||||
// CraftBukkit start - Use field for loop variable
|
// CraftBukkit start - Use field for loop variable
|
||||||
@ -1161,21 +1161,24 @@ index 6ba7bbb..c058aa4 100644
|
|||||||
int entitiesThisCycle = 0;
|
int entitiesThisCycle = 0;
|
||||||
if (tickPosition < 0) tickPosition = 0;
|
if (tickPosition < 0) tickPosition = 0;
|
||||||
for (entityLimiter.initTick();
|
for (entityLimiter.initTick();
|
||||||
@@ -1453,10 +1456,11 @@ public abstract class World implements IBlockAccess {
|
@@ -1432,10 +1435,14 @@ public abstract class World implements IBlockAccess {
|
||||||
this.methodProfiler.a("tick");
|
this.methodProfiler.a("tick");
|
||||||
if (!entity.dead && !(entity instanceof EntityPlayer)) {
|
if (!entity.dead && !(entity instanceof EntityPlayer)) {
|
||||||
try {
|
try {
|
||||||
- SpigotTimings.tickEntityTimer.startTiming(); // Spigot
|
- SpigotTimings.tickEntityTimer.startTiming(); // Spigot
|
||||||
+ entity.tickTimer.startTiming(); // Paper
|
+ entity.tickTimer.startTiming(); // Paper
|
||||||
this.g(entity);
|
this.h(entity);
|
||||||
- SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
|
- SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
|
||||||
|
+ entity.tickTimer.stopTiming(); // Paper
|
||||||
|
+ entity.tickTimer.startTiming(); // Paper
|
||||||
|
+ this.g(entity);
|
||||||
+ entity.tickTimer.stopTiming(); // Paper
|
+ entity.tickTimer.stopTiming(); // Paper
|
||||||
} catch (Throwable throwable1) {
|
} catch (Throwable throwable1) {
|
||||||
+ entity.tickTimer.stopTiming();
|
+ entity.tickTimer.stopTiming();
|
||||||
crashreport1 = CrashReport.a(throwable1, "Ticking entity");
|
crashreport1 = CrashReport.a(throwable1, "Ticking entity");
|
||||||
crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
|
crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
|
||||||
entity.appendEntityCrashDetails(crashreportsystemdetails1);
|
entity.appendEntityCrashDetails(crashreportsystemdetails1);
|
||||||
@@ -1589,6 +1593,7 @@ public abstract class World implements IBlockAccess {
|
@@ -1568,6 +1575,7 @@ public abstract class World implements IBlockAccess {
|
||||||
}
|
}
|
||||||
|
|
||||||
timings.tileEntityPending.stopTiming(); // Spigot
|
timings.tileEntityPending.stopTiming(); // Spigot
|
||||||
@ -1183,7 +1186,7 @@ index 6ba7bbb..c058aa4 100644
|
|||||||
this.methodProfiler.b();
|
this.methodProfiler.b();
|
||||||
this.methodProfiler.b();
|
this.methodProfiler.b();
|
||||||
}
|
}
|
||||||
@@ -1641,7 +1646,6 @@ public abstract class World implements IBlockAccess {
|
@@ -1620,7 +1628,6 @@ public abstract class World implements IBlockAccess {
|
||||||
entity.ticksLived++;
|
entity.ticksLived++;
|
||||||
entity.inactiveTick();
|
entity.inactiveTick();
|
||||||
} else {
|
} else {
|
||||||
@ -1191,7 +1194,7 @@ index 6ba7bbb..c058aa4 100644
|
|||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
entity.M = entity.locX;
|
entity.M = entity.locX;
|
||||||
entity.N = entity.locY;
|
entity.N = entity.locY;
|
||||||
@@ -1650,6 +1654,7 @@ public abstract class World implements IBlockAccess {
|
@@ -1629,6 +1636,7 @@ public abstract class World implements IBlockAccess {
|
||||||
entity.lastPitch = entity.pitch;
|
entity.lastPitch = entity.pitch;
|
||||||
if (flag && entity.aa) {
|
if (flag && entity.aa) {
|
||||||
++entity.ticksLived;
|
++entity.ticksLived;
|
||||||
@ -1199,7 +1202,7 @@ index 6ba7bbb..c058aa4 100644
|
|||||||
if (entity.isPassenger()) {
|
if (entity.isPassenger()) {
|
||||||
entity.aw();
|
entity.aw();
|
||||||
} else {
|
} else {
|
||||||
@@ -1708,8 +1713,6 @@ public abstract class World implements IBlockAccess {
|
@@ -1687,8 +1695,6 @@ public abstract class World implements IBlockAccess {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1209,7 +1212,7 @@ index 6ba7bbb..c058aa4 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
index f369b49..2817191 100644
|
index 4713150..26627ce 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
@@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
@@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 468154ec473f5c5111620f0c68e1f3ea8076128b Mon Sep 17 00:00:00 2001
|
From d2e9e489fbf88f2b4b32be8b0c9125d5590409aa Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Tue, 1 Mar 2016 13:14:11 -0600
|
Date: Tue, 1 Mar 2016 13:14:11 -0600
|
||||||
Subject: [PATCH] Configurable fishing time ranges
|
Subject: [PATCH] Configurable fishing time ranges
|
||||||
@ -22,16 +22,16 @@ index ae3d0e4..7b2b95d 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
||||||
index 0eb6207..96c3d66 100644
|
index 472f367..0c528c6 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
||||||
@@ -371,7 +371,7 @@ public class EntityFishingHook extends Entity {
|
@@ -381,7 +381,7 @@ public class EntityFishingHook extends Entity {
|
||||||
this.at = MathHelper.nextInt(this.random, 20, 80);
|
this.at = MathHelper.nextInt(this.random, 20, 80);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
- this.h = MathHelper.nextInt(this.random, 100, 600);
|
- this.h = MathHelper.nextInt(this.random, 100, 600);
|
||||||
+ this.h = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper - Configurable fishing time range
|
+ this.h = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper
|
||||||
this.h -= EnchantmentManager.g(this.owner) * 20 * 5;
|
this.h -= this.ax * 20 * 5;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
From ee86791d8752389218a188dd920ff3eb860dd9f2 Mon Sep 17 00:00:00 2001
|
From 066cd36ae439a3797d875ea96e09264bfdff58cd Mon Sep 17 00:00:00 2001
|
||||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
Date: Tue, 1 Mar 2016 14:47:52 -0600
|
Date: Tue, 1 Mar 2016 14:47:52 -0600
|
||||||
Subject: [PATCH] Player affects spawning API
|
Subject: [PATCH] Player affects spawning API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||||
index a281c8d..f0a673f 100644
|
index 82146de..f1823af 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||||
@@ -63,6 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
|
@@ -63,6 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
|
||||||
@ -17,7 +17,7 @@ index a281c8d..f0a673f 100644
|
|||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
public boolean fauxSleeping;
|
public boolean fauxSleeping;
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||||
index 3f7eae1..a8f3645 100644
|
index d3cf840..b6ecd02 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||||
@@ -617,7 +617,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
@@ -617,7 +617,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||||
@ -30,7 +30,7 @@ index 3f7eae1..a8f3645 100644
|
|||||||
double d1 = entityhuman.locY - this.locY;
|
double d1 = entityhuman.locY - this.locY;
|
||||||
double d2 = entityhuman.locZ - this.locZ;
|
double d2 = entityhuman.locZ - this.locZ;
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
|
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
|
||||||
index fce2498..e2423c2 100644
|
index 5af51cc..7531c9b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java
|
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
|
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
|
||||||
@@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
|
@@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
|
||||||
@ -44,7 +44,7 @@ index fce2498..e2423c2 100644
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
index bec25e4..30aacc9 100644
|
index 17bf3e4..a05fad5 100644
|
||||||
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
@@ -52,7 +52,7 @@ public final class SpawnerCreature {
|
@@ -52,7 +52,7 @@ public final class SpawnerCreature {
|
||||||
@ -57,10 +57,10 @@ index bec25e4..30aacc9 100644
|
|||||||
|
|
||||||
j = MathHelper.floor(entityhuman.locZ / 16.0D);
|
j = MathHelper.floor(entityhuman.locZ / 16.0D);
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 5e09117..11fbe27 100644
|
index 36c2dfb..1a6803a 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -2743,7 +2743,7 @@ public abstract class World implements IBlockAccess {
|
@@ -2725,7 +2725,7 @@ public abstract class World implements IBlockAccess {
|
||||||
for (int i = 0; i < this.players.size(); ++i) {
|
for (int i = 0; i < this.players.size(); ++i) {
|
||||||
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
|
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
|
||||||
|
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
From 11ba8a856ee1d222a3012b43949ac3e3d15a39f0 Mon Sep 17 00:00:00 2001
|
From aab99807faf78b09a62df2570b2b70ea5551b67c Mon Sep 17 00:00:00 2001
|
||||||
From: Byteflux <byte@byteflux.net>
|
From: Byteflux <byte@byteflux.net>
|
||||||
Date: Tue, 1 Mar 2016 23:45:08 -0600
|
Date: Tue, 1 Mar 2016 23:45:08 -0600
|
||||||
Subject: [PATCH] Entity Origin API
|
Subject: [PATCH] Entity Origin API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index e0276a6..6766166 100644
|
index f86fe82..537adb5 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -144,6 +144,7 @@ public abstract class Entity implements ICommandListener {
|
@@ -147,6 +147,7 @@ public abstract class Entity implements ICommandListener {
|
||||||
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
|
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
|
||||||
public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
|
public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
|
||||||
public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper
|
public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper
|
||||||
@ -16,7 +16,7 @@ index e0276a6..6766166 100644
|
|||||||
// Spigot start
|
// Spigot start
|
||||||
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
|
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
|
||||||
public final boolean defaultActivationState;
|
public final boolean defaultActivationState;
|
||||||
@@ -1416,6 +1417,11 @@ public abstract class Entity implements ICommandListener {
|
@@ -1469,6 +1470,11 @@ public abstract class Entity implements ICommandListener {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -28,7 +28,7 @@ index e0276a6..6766166 100644
|
|||||||
return nbttagcompound;
|
return nbttagcompound;
|
||||||
} catch (Throwable throwable) {
|
} catch (Throwable throwable) {
|
||||||
CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
|
CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
|
||||||
@@ -1560,6 +1566,13 @@ public abstract class Entity implements ICommandListener {
|
@@ -1613,6 +1619,13 @@ public abstract class Entity implements ICommandListener {
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
@ -42,7 +42,7 @@ index e0276a6..6766166 100644
|
|||||||
} catch (Throwable throwable) {
|
} catch (Throwable throwable) {
|
||||||
CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
|
CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
|
||||||
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
|
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
|
||||||
@@ -1584,6 +1597,7 @@ public abstract class Entity implements ICommandListener {
|
@@ -1637,6 +1650,7 @@ public abstract class Entity implements ICommandListener {
|
||||||
|
|
||||||
protected abstract void b(NBTTagCompound nbttagcompound);
|
protected abstract void b(NBTTagCompound nbttagcompound);
|
||||||
|
|
||||||
@ -51,7 +51,7 @@ index e0276a6..6766166 100644
|
|||||||
NBTTagList nbttaglist = new NBTTagList();
|
NBTTagList nbttaglist = new NBTTagList();
|
||||||
double[] adouble1 = adouble;
|
double[] adouble1 = adouble;
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||||
index 2ed1fb1..042670b 100644
|
index 4c168d3..307a44c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||||
@@ -247,6 +247,14 @@ public class EntityFallingBlock extends Entity {
|
@@ -247,6 +247,14 @@ public class EntityFallingBlock extends Entity {
|
||||||
@ -89,7 +89,7 @@ index fd07356..25e471d 100644
|
|||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index c8ba375..e73c9fb 100644
|
index 1a6803a..629ea2e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess {
|
@@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess {
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
From 4b8c160adcef0468b38af857709f1a50f7a916ec Mon Sep 17 00:00:00 2001
|
From 0861215886567d4dff9f6d534845572d9a0a1de6 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 1 Mar 2016 23:52:34 -0600
|
Date: Tue, 1 Mar 2016 23:52:34 -0600
|
||||||
Subject: [PATCH] Prevent tile entity and entity crashes
|
Subject: [PATCH] Prevent tile entity and entity crashes
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
||||||
index 0f505ed..1f3e89b 100644
|
index b3d3df4..d0c0371 100644
|
||||||
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
||||||
@@ -175,7 +175,12 @@ public abstract class TileEntity {
|
@@ -175,7 +175,12 @@ public abstract class TileEntity {
|
||||||
@ -23,10 +23,10 @@ index 0f505ed..1f3e89b 100644
|
|||||||
public String a() throws Exception {
|
public String a() throws Exception {
|
||||||
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
|
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 0d917b6..536da4d 100644
|
index 629ea2e..40b8bf3 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -1468,10 +1468,12 @@ public abstract class World implements IBlockAccess {
|
@@ -1450,10 +1450,12 @@ public abstract class World implements IBlockAccess {
|
||||||
entity.tickTimer.stopTiming(); // Paper
|
entity.tickTimer.stopTiming(); // Paper
|
||||||
} catch (Throwable throwable1) {
|
} catch (Throwable throwable1) {
|
||||||
entity.tickTimer.stopTiming();
|
entity.tickTimer.stopTiming();
|
||||||
@ -43,7 +43,7 @@ index 0d917b6..536da4d 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1534,10 +1536,13 @@ public abstract class World implements IBlockAccess {
|
@@ -1516,10 +1518,13 @@ public abstract class World implements IBlockAccess {
|
||||||
((ITickable) tileentity).F_();
|
((ITickable) tileentity).F_();
|
||||||
this.methodProfiler.b();
|
this.methodProfiler.b();
|
||||||
} catch (Throwable throwable2) {
|
} catch (Throwable throwable2) {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 5b6b3194d535a25d2f22da2bef56abe47f10bcca Mon Sep 17 00:00:00 2001
|
From 66a919e1275e53a9d28c58b412e473ab6e9baa78 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Tue, 1 Mar 2016 23:58:50 -0600
|
Date: Tue, 1 Mar 2016 23:58:50 -0600
|
||||||
Subject: [PATCH] Configurable top of nether void damage
|
Subject: [PATCH] Configurable top of nether void damage
|
||||||
@ -20,10 +20,10 @@ index 06d1527..2767ffb 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index 6766166..40398ca 100644
|
index 537adb5..7f6d492 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -390,9 +390,15 @@ public abstract class Entity implements ICommandListener {
|
@@ -394,9 +394,15 @@ public abstract class Entity implements ICommandListener {
|
||||||
this.fallDistance *= 0.5F;
|
this.fallDistance *= 0.5F;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,7 +39,7 @@ index 6766166..40398ca 100644
|
|||||||
|
|
||||||
if (!this.world.isClientSide) {
|
if (!this.world.isClientSide) {
|
||||||
this.setFlag(0, this.fireTicks > 0);
|
this.setFlag(0, this.fireTicks > 0);
|
||||||
@@ -402,6 +408,18 @@ public abstract class Entity implements ICommandListener {
|
@@ -406,6 +412,18 @@ public abstract class Entity implements ICommandListener {
|
||||||
this.world.methodProfiler.b();
|
this.world.methodProfiler.b();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,7 +58,7 @@ index 6766166..40398ca 100644
|
|||||||
protected void H() {
|
protected void H() {
|
||||||
if (this.portalCooldown > 0) {
|
if (this.portalCooldown > 0) {
|
||||||
--this.portalCooldown;
|
--this.portalCooldown;
|
||||||
@@ -458,6 +476,7 @@ public abstract class Entity implements ICommandListener {
|
@@ -462,6 +480,7 @@ public abstract class Entity implements ICommandListener {
|
||||||
this.fireTicks = 0;
|
this.fireTicks = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
From 026b5acef75a274fa06375125444e828c071d629 Mon Sep 17 00:00:00 2001
|
From 383074be770112c2b2dc2e9810fa50658b8c3e33 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Wed, 2 Mar 2016 00:03:55 -0600
|
Date: Wed, 2 Mar 2016 00:03:55 -0600
|
||||||
Subject: [PATCH] Check online mode before converting and renaming player data
|
Subject: [PATCH] Check online mode before converting and renaming player data
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
||||||
index b6cb918..7c4c599 100644
|
index caec568..30b54a5 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
||||||
@@ -166,7 +166,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
|
@@ -167,7 +167,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
|
||||||
File file = new File(this.playerDir, entityhuman.bf() + ".dat");
|
File file = new File(this.playerDir, entityhuman.bf() + ".dat");
|
||||||
// Spigot Start
|
// Spigot Start
|
||||||
boolean usingWrongFile = false;
|
boolean usingWrongFile = false;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From c0b4ee8d6319a0fa582a082b881713ff96d27b2b Mon Sep 17 00:00:00 2001
|
From ebb94ef7bf1505f81ec9c72e84b1b56ceb7970d6 Mon Sep 17 00:00:00 2001
|
||||||
From: DoctorDark <doctordark11@gmail.com>
|
From: DoctorDark <doctordark11@gmail.com>
|
||||||
Date: Wed, 16 Mar 2016 02:21:39 -0500
|
Date: Wed, 16 Mar 2016 02:21:39 -0500
|
||||||
Subject: [PATCH] Configurable end credits
|
Subject: [PATCH] Configurable end credits
|
||||||
@ -20,10 +20,10 @@ index f7a0c18..31503e7 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index 5b88b7a..ca9e94a 100644
|
index 12e4d95..dc02472 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -495,6 +495,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -512,6 +512,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
return this.world.pvpMode;
|
return this.world.pvpMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,7 +39,7 @@ index 5b88b7a..ca9e94a 100644
|
|||||||
@Nullable
|
@Nullable
|
||||||
public Entity c(int i) {
|
public Entity c(int i) {
|
||||||
// this.worldChangeInvuln = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
|
// this.worldChangeInvuln = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
|
||||||
@@ -503,7 +512,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -520,7 +529,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
this.world.kill(this);
|
this.world.kill(this);
|
||||||
if (!this.viewingCredits) {
|
if (!this.viewingCredits) {
|
||||||
this.viewingCredits = true;
|
this.viewingCredits = true;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 06a5cb408921635efb8416880126f0bc0c7e1233 Mon Sep 17 00:00:00 2001
|
From ffe94e57efe10e54ab3dde6ffff89854ffb3cc46 Mon Sep 17 00:00:00 2001
|
||||||
From: Sudzzy <originmc@outlook.com>
|
From: Sudzzy <originmc@outlook.com>
|
||||||
Date: Wed, 2 Mar 2016 15:03:53 -0600
|
Date: Wed, 2 Mar 2016 15:03:53 -0600
|
||||||
Subject: [PATCH] Configurable mob spawner tick rate
|
Subject: [PATCH] Configurable mob spawner tick rate
|
||||||
@ -19,10 +19,10 @@ index a6afdd3..57480f5 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
||||||
index 5b41955..e523267 100644
|
index 796b3e5..ce1db63 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
||||||
@@ -20,6 +20,7 @@ public abstract class MobSpawnerAbstract {
|
@@ -19,6 +19,7 @@ public abstract class MobSpawnerAbstract {
|
||||||
private int maxNearbyEntities = 6;
|
private int maxNearbyEntities = 6;
|
||||||
private int requiredPlayerRange = 16;
|
private int requiredPlayerRange = 16;
|
||||||
private int spawnRange = 4;
|
private int spawnRange = 4;
|
||||||
@ -30,7 +30,7 @@ index 5b41955..e523267 100644
|
|||||||
|
|
||||||
public MobSpawnerAbstract() {}
|
public MobSpawnerAbstract() {}
|
||||||
|
|
||||||
@@ -45,6 +46,10 @@ public abstract class MobSpawnerAbstract {
|
@@ -43,6 +44,10 @@ public abstract class MobSpawnerAbstract {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void c() {
|
public void c() {
|
||||||
@ -41,7 +41,7 @@ index 5b41955..e523267 100644
|
|||||||
if (!this.h()) {
|
if (!this.h()) {
|
||||||
this.e = this.d;
|
this.e = this.d;
|
||||||
} else {
|
} else {
|
||||||
@@ -58,18 +63,18 @@ public abstract class MobSpawnerAbstract {
|
@@ -56,18 +61,18 @@ public abstract class MobSpawnerAbstract {
|
||||||
this.a().addParticle(EnumParticle.SMOKE_NORMAL, d0, d1, d2, 0.0D, 0.0D, 0.0D, new int[0]);
|
this.a().addParticle(EnumParticle.SMOKE_NORMAL, d0, d1, d2, 0.0D, 0.0D, 0.0D, new int[0]);
|
||||||
this.a().addParticle(EnumParticle.FLAME, d0, d1, d2, 0.0D, 0.0D, 0.0D, new int[0]);
|
this.a().addParticle(EnumParticle.FLAME, d0, d1, d2, 0.0D, 0.0D, 0.0D, new int[0]);
|
||||||
if (this.spawnDelay > 0) {
|
if (this.spawnDelay > 0) {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From a0d114ddff46e2250c3550301b1aa355ef9366c9 Mon Sep 17 00:00:00 2001
|
From 05da6da19a804f28d5a78f078ce02f86366013f9 Mon Sep 17 00:00:00 2001
|
||||||
From: Sudzzy <originmc@outlook.com>
|
From: Sudzzy <originmc@outlook.com>
|
||||||
Date: Wed, 2 Mar 2016 23:34:44 -0600
|
Date: Wed, 2 Mar 2016 23:34:44 -0600
|
||||||
Subject: [PATCH] Configurable container update tick rate
|
Subject: [PATCH] Configurable container update tick rate
|
||||||
@ -19,7 +19,7 @@ index 57480f5..b2b94b8 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index 1982749..9662ea0 100644
|
index 80e7105..2c8a21e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -65,6 +65,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -65,6 +65,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
@ -30,7 +30,7 @@ index 1982749..9662ea0 100644
|
|||||||
|
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
public String displayName;
|
public String displayName;
|
||||||
@@ -210,7 +211,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -227,7 +228,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
--this.noDamageTicks;
|
--this.noDamageTicks;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
From e74bafb4d5cfe50bad8aeb59969cc28eaa9c8e35 Mon Sep 17 00:00:00 2001
|
From 171cc5dd20887c2d3ebc13f3a7e08e8d42969911 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Wed, 2 Mar 2016 23:45:17 -0600
|
Date: Wed, 2 Mar 2016 23:45:17 -0600
|
||||||
Subject: [PATCH] Disable spigot tick limiters
|
Subject: [PATCH] Disable spigot tick limiters
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index cf2bbba..82024a1 100644
|
index 23aad3f..bfe0ee2 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -1445,10 +1445,10 @@ public abstract class World implements IBlockAccess {
|
@@ -1424,10 +1424,10 @@ public abstract class World implements IBlockAccess {
|
||||||
// CraftBukkit start - Use field for loop variable
|
// CraftBukkit start - Use field for loop variable
|
||||||
co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
|
co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
|
||||||
int entitiesThisCycle = 0;
|
int entitiesThisCycle = 0;
|
||||||
@ -23,7 +23,7 @@ index cf2bbba..82024a1 100644
|
|||||||
tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
|
tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
|
||||||
entity = (Entity) this.entityList.get(this.tickPosition);
|
entity = (Entity) this.entityList.get(this.tickPosition);
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
@@ -1514,9 +1514,7 @@ public abstract class World implements IBlockAccess {
|
@@ -1496,9 +1496,7 @@ public abstract class World implements IBlockAccess {
|
||||||
// Spigot start
|
// Spigot start
|
||||||
// Iterator iterator = this.tileEntityListTick.iterator();
|
// Iterator iterator = this.tileEntityListTick.iterator();
|
||||||
int tilesThisCycle = 0;
|
int tilesThisCycle = 0;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From b6c5618486f53dfafb58fd8b0699a2ebe145013c Mon Sep 17 00:00:00 2001
|
From 16ce00684b1104998dcda574660c2ff0954f2de7 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 3 Mar 2016 01:17:12 -0600
|
Date: Thu, 3 Mar 2016 01:17:12 -0600
|
||||||
Subject: [PATCH] Ensure commands are not ran async
|
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.
|
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
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
index bc3af9b..878a79e 100644
|
index 3330513..4d8c88a 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
|
||||||
@@ -1251,6 +1251,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
@@ -1258,6 +1258,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!async && s.startsWith("/")) {
|
if (!async && s.startsWith("/")) {
|
||||||
|
@ -1,60 +0,0 @@
|
|||||||
From d932ae0cc0bfac3a416351d0d9f847d7da9a2c82 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
||||||
Date: Thu, 3 Mar 2016 02:21:58 -0600
|
|
||||||
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
||||||
index b7a825a..b59b756 100644
|
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
||||||
@@ -1314,6 +1314,18 @@ public final class CraftServer implements Server {
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // Paper start
|
|
||||||
+ @Override
|
|
||||||
+ public void broadcast(BaseComponent component) {
|
|
||||||
+ this.spigot.broadcast(component);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public void broadcast(BaseComponent... components) {
|
|
||||||
+ this.spigot.broadcast(components);
|
|
||||||
+ }
|
|
||||||
+ // Paper end
|
|
||||||
+
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public OfflinePlayer getOfflinePlayer(String name) {
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
||||||
index 318b460..2108001 100644
|
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
||||||
@@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // Paper start
|
|
||||||
+ @Override
|
|
||||||
+ public void sendMessage(BaseComponent component) {
|
|
||||||
+ this.spigot.sendMessage(component);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public void sendMessage(BaseComponent... components) {
|
|
||||||
+ this.spigot.sendMessage(components);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, BaseComponent... components) {
|
|
||||||
+ this.spigot.sendMessage(position, components);
|
|
||||||
+ }
|
|
||||||
+ // Paper end
|
|
||||||
+
|
|
||||||
@Override
|
|
||||||
public String getDisplayName() {
|
|
||||||
return getHandle().displayName;
|
|
||||||
--
|
|
||||||
2.9.3
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 7a2dcb0a133f45c7b66c88d85e5a048ea1306012 Mon Sep 17 00:00:00 2001
|
From acfd952de5edfc46ee5f7933a12ec1dde9ff5def Mon Sep 17 00:00:00 2001
|
||||||
From: Techcable <Techcable@outlook.com>
|
From: Techcable <Techcable@outlook.com>
|
||||||
Date: Thu, 3 Mar 2016 02:32:10 -0600
|
Date: Thu, 3 Mar 2016 02:32:10 -0600
|
||||||
Subject: [PATCH] Player Tab List and Title APIs
|
Subject: [PATCH] Player Tab List and Title APIs
|
||||||
@ -78,7 +78,7 @@ index 7bcafa8..4f6c1c2 100644
|
|||||||
|
|
||||||
if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
|
if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
index 2108001..7a4ceb3 100644
|
index 318b460..b597ae2 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,5 +1,6 @@
|
||||||
@ -88,11 +88,11 @@ index 2108001..7a4ceb3 100644
|
|||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
import com.mojang.authlib.GameProfile;
|
import com.mojang.authlib.GameProfile;
|
||||||
@@ -171,6 +172,83 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@@ -156,6 +157,85 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, BaseComponent... components) {
|
}
|
||||||
this.spigot.sendMessage(position, components);
|
|
||||||
}
|
}
|
||||||
+
|
|
||||||
|
+ // Paper start
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
|
+ public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
|
||||||
+ PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
|
+ PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
|
||||||
@ -169,9 +169,11 @@ index 2108001..7a4ceb3 100644
|
|||||||
+ public void hideTitle() {
|
+ public void hideTitle() {
|
||||||
+ getHandle().playerConnection.sendPacket(new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.CLEAR, (BaseComponent[]) null, 0, 0, 0));
|
+ getHandle().playerConnection.sendPacket(new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.CLEAR, (BaseComponent[]) null, 0, 0, 0));
|
||||||
+ }
|
+ }
|
||||||
// Paper end
|
+ // Paper end
|
||||||
|
+
|
||||||
@Override
|
@Override
|
||||||
|
public String getDisplayName() {
|
||||||
|
return getHandle().displayName;
|
||||||
--
|
--
|
||||||
2.9.3
|
2.9.3
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 0cd5324300e158b0bde0ea0c1884835194f9bf85 Mon Sep 17 00:00:00 2001
|
From d49248d0e6675ce7fc2b0d5b5a042e5dbf009366 Mon Sep 17 00:00:00 2001
|
||||||
From: Joseph Hirschfeld <joe@ibj.io>
|
From: Joseph Hirschfeld <joe@ibj.io>
|
||||||
Date: Thu, 3 Mar 2016 02:33:53 -0600
|
Date: Thu, 3 Mar 2016 02:33:53 -0600
|
||||||
Subject: [PATCH] Ensure inv drag is in bounds
|
Subject: [PATCH] Ensure inv drag is in bounds
|
@ -1,14 +1,14 @@
|
|||||||
From 43bbb17f6b8f99158dace12ff84e61361b1fa421 Mon Sep 17 00:00:00 2001
|
From 49586e9ce2c202a9c911d922c357b5914814c1eb Mon Sep 17 00:00:00 2001
|
||||||
From: Joseph Hirschfeld <joe@ibj.io>
|
From: Joseph Hirschfeld <joe@ibj.io>
|
||||||
Date: Thu, 3 Mar 2016 02:39:54 -0600
|
Date: Thu, 3 Mar 2016 02:39:54 -0600
|
||||||
Subject: [PATCH] Change implementation of (tile)entity removal list
|
Subject: [PATCH] Change implementation of (tile)entity removal list
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index 40398ca..10eb818 100644
|
index 7f6d492..1b37b60 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -120,10 +120,10 @@ public abstract class Entity implements ICommandListener {
|
@@ -121,10 +121,10 @@ public abstract class Entity implements ICommandListener {
|
||||||
private static final DataWatcherObject<Boolean> aB = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
|
private static final DataWatcherObject<Boolean> aB = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
|
||||||
private static final DataWatcherObject<Boolean> aC = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
|
private static final DataWatcherObject<Boolean> aC = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
|
||||||
private static final DataWatcherObject<Boolean> aD = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
|
private static final DataWatcherObject<Boolean> aD = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
|
||||||
@ -24,7 +24,7 @@ index 40398ca..10eb818 100644
|
|||||||
public boolean impulse;
|
public boolean impulse;
|
||||||
public int portalCooldown;
|
public int portalCooldown;
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 82024a1..0e462ce 100644
|
index bfe0ee2..ad8c031 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
|
@@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
|
||||||
@ -53,7 +53,7 @@ index 82024a1..0e462ce 100644
|
|||||||
public final List<EntityHuman> players = Lists.newArrayList();
|
public final List<EntityHuman> players = Lists.newArrayList();
|
||||||
public final List<Entity> j = Lists.newArrayList();
|
public final List<Entity> j = Lists.newArrayList();
|
||||||
protected final IntHashMap<Entity> entitiesById = new IntHashMap();
|
protected final IntHashMap<Entity> entitiesById = new IntHashMap();
|
||||||
@@ -1416,20 +1421,20 @@ public abstract class World implements IBlockAccess {
|
@@ -1395,20 +1400,20 @@ public abstract class World implements IBlockAccess {
|
||||||
this.entityList.removeAll(this.f);
|
this.entityList.removeAll(this.f);
|
||||||
|
|
||||||
int j;
|
int j;
|
@ -1,4 +1,4 @@
|
|||||||
From c0c4191f67899e3143f6d575291a7a5e9db41293 Mon Sep 17 00:00:00 2001
|
From c93f33417194cd9bcda84b504302b6fd80bb6134 Mon Sep 17 00:00:00 2001
|
||||||
From: Joseph Hirschfeld <joe@ibj.io>
|
From: Joseph Hirschfeld <joe@ibj.io>
|
||||||
Date: Thu, 3 Mar 2016 02:46:17 -0600
|
Date: Thu, 3 Mar 2016 02:46:17 -0600
|
||||||
Subject: [PATCH] Add configurable portal search radius
|
Subject: [PATCH] Add configurable portal search radius
|
@ -1,4 +1,4 @@
|
|||||||
From 1eb36b44685655bc53589dcc93ac704000d8f3fa Mon Sep 17 00:00:00 2001
|
From 3ae58c1044d54f764d2b82a402281b50f74d5be4 Mon Sep 17 00:00:00 2001
|
||||||
From: Joseph Hirschfeld <joe@ibj.io>
|
From: Joseph Hirschfeld <joe@ibj.io>
|
||||||
Date: Thu, 3 Mar 2016 02:48:12 -0600
|
Date: Thu, 3 Mar 2016 02:48:12 -0600
|
||||||
Subject: [PATCH] Add velocity warnings
|
Subject: [PATCH] Add velocity warnings
|
@ -1,4 +1,4 @@
|
|||||||
From 7e1a809697044e335aa5821b9b74887ff00c93de Mon Sep 17 00:00:00 2001
|
From 1e37ab83bd78027f61a60f51dd2dc6207ffc0ca7 Mon Sep 17 00:00:00 2001
|
||||||
From: Sudzzy <originmc@outlook.com>
|
From: Sudzzy <originmc@outlook.com>
|
||||||
Date: Thu, 3 Mar 2016 02:50:31 -0600
|
Date: Thu, 3 Mar 2016 02:50:31 -0600
|
||||||
Subject: [PATCH] Fix inter-world teleportation glitches
|
Subject: [PATCH] Fix inter-world teleportation glitches
|
||||||
@ -25,10 +25,10 @@ index ed63854..7005d69 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
index 7a4ceb3..e7b04c2 100644
|
index b597ae2..44d2698 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
@@ -592,7 +592,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@@ -577,7 +577,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
if (fromWorld == toWorld) {
|
if (fromWorld == toWorld) {
|
||||||
entity.playerConnection.teleport(to);
|
entity.playerConnection.teleport(to);
|
||||||
} else {
|
} else {
|
@ -1,4 +1,4 @@
|
|||||||
From 419ba5a439fd82674ae83f25b6b3eecb462bb44e Mon Sep 17 00:00:00 2001
|
From 2d7c77d02cb0f23577e767cc4d0d04b7634d08f0 Mon Sep 17 00:00:00 2001
|
||||||
From: Joseph Hirschfeld <joe@ibj.io>
|
From: Joseph Hirschfeld <joe@ibj.io>
|
||||||
Date: Thu, 3 Mar 2016 03:15:41 -0600
|
Date: Thu, 3 Mar 2016 03:15:41 -0600
|
||||||
Subject: [PATCH] Add exception reporting event
|
Subject: [PATCH] Add exception reporting event
|
||||||
@ -244,7 +244,7 @@ index 933934f..19fbf9b 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
index 30aacc9..31bafc6 100644
|
index a05fad5..29219ec 100644
|
||||||
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
@@ -7,6 +7,7 @@ import java.util.Random;
|
@@ -7,6 +7,7 @@ import java.util.Random;
|
||||||
@ -292,7 +292,7 @@ index 7af5b7d..2b49802 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 0e462ce..4cce4bf 100644
|
index ad8c031..ceb0d71 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -1,5 +1,7 @@
|
@@ -1,5 +1,7 @@
|
||||||
@ -303,7 +303,7 @@ index 0e462ce..4cce4bf 100644
|
|||||||
import com.google.common.base.Function;
|
import com.google.common.base.Function;
|
||||||
import com.google.common.base.Objects;
|
import com.google.common.base.Objects;
|
||||||
import com.google.common.base.Predicate;
|
import com.google.common.base.Predicate;
|
||||||
@@ -1476,8 +1478,10 @@ public abstract class World implements IBlockAccess {
|
@@ -1458,8 +1460,10 @@ public abstract class World implements IBlockAccess {
|
||||||
} catch (Throwable throwable1) {
|
} catch (Throwable throwable1) {
|
||||||
entity.tickTimer.stopTiming();
|
entity.tickTimer.stopTiming();
|
||||||
// Paper start - Prevent tile entity and entity crashes
|
// Paper start - Prevent tile entity and entity crashes
|
||||||
@ -315,7 +315,7 @@ index 0e462ce..4cce4bf 100644
|
|||||||
entity.dead = true;
|
entity.dead = true;
|
||||||
continue;
|
continue;
|
||||||
// Paper end
|
// Paper end
|
||||||
@@ -1542,8 +1546,10 @@ public abstract class World implements IBlockAccess {
|
@@ -1524,8 +1528,10 @@ public abstract class World implements IBlockAccess {
|
||||||
this.methodProfiler.b();
|
this.methodProfiler.b();
|
||||||
} catch (Throwable throwable2) {
|
} catch (Throwable throwable2) {
|
||||||
// Paper start - Prevent tile entity and entity crashes
|
// Paper start - Prevent tile entity and entity crashes
|
@ -1,4 +1,4 @@
|
|||||||
From cce8316893f358e8804df5975fff98d9a57af614 Mon Sep 17 00:00:00 2001
|
From 1cff86b001e1cbea670acc16a55ce94ef54334cf Mon Sep 17 00:00:00 2001
|
||||||
From: kashike <kashike@vq.lc>
|
From: kashike <kashike@vq.lc>
|
||||||
Date: Tue, 8 Mar 2016 18:28:43 -0800
|
Date: Tue, 8 Mar 2016 18:28:43 -0800
|
||||||
Subject: [PATCH] Don't nest if we don't need to when cerealising text
|
Subject: [PATCH] Don't nest if we don't need to when cerealising text
|
@ -1,4 +1,4 @@
|
|||||||
From 6f05d80095233fccb6de27c6b01d1922759a6a3b Mon Sep 17 00:00:00 2001
|
From e8122a81295e843f89f0360bf8362bec86163d8f Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 8 Mar 2016 23:25:45 -0500
|
Date: Tue, 8 Mar 2016 23:25:45 -0500
|
||||||
Subject: [PATCH] Disable Scoreboards for non players by default
|
Subject: [PATCH] Disable Scoreboards for non players by default
|
||||||
@ -37,10 +37,10 @@ index 7af5d0a..ab9aa13 100644
|
|||||||
|
|
||||||
if (scoreboard.addPlayerToTeam(s2, s)) {
|
if (scoreboard.addPlayerToTeam(s2, s)) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index 10eb818..875dcc8 100644
|
index 1b37b60..453efd4 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -1950,6 +1950,7 @@ public abstract class Entity implements ICommandListener {
|
@@ -2003,6 +2003,7 @@ public abstract class Entity implements ICommandListener {
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public ScoreboardTeamBase aQ() {
|
public ScoreboardTeamBase aQ() {
|
@ -1,11 +1,11 @@
|
|||||||
From 81be8d010592ebcb1bf34ccb0168c779ce81c430 Mon Sep 17 00:00:00 2001
|
From d4b532c8addb75217b3f2a8461df8dda9bb2f75c Mon Sep 17 00:00:00 2001
|
||||||
From: mrapple <tony@oc.tc>
|
From: mrapple <tony@oc.tc>
|
||||||
Date: Sun, 25 Nov 2012 13:43:39 -0600
|
Date: Sun, 25 Nov 2012 13:43:39 -0600
|
||||||
Subject: [PATCH] Add methods for working with arrows stuck in living entities
|
Subject: [PATCH] Add methods for working with arrows stuck in living entities
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
index fe6fe3f..fbc20ba 100644
|
index 885c108..42347e7 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
@@ -1379,10 +1379,12 @@ public abstract class EntityLiving extends Entity {
|
@@ -1379,10 +1379,12 @@ public abstract class EntityLiving extends Entity {
|
@ -1,14 +1,14 @@
|
|||||||
From 3a3b561fa65a9f3968be6fbf9e6a810da8930a8e Mon Sep 17 00:00:00 2001
|
From b3c68d4badf919471ce40ff937ec2d383419c167 Mon Sep 17 00:00:00 2001
|
||||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
Date: Sat, 4 Apr 2015 23:17:52 -0400
|
Date: Sat, 4 Apr 2015 23:17:52 -0400
|
||||||
Subject: [PATCH] Complete resource pack API
|
Subject: [PATCH] Complete resource pack API
|
||||||
|
|
||||||
|
|
||||||
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 878a79e..687a8e6 100644
|
index 4d8c88a..b42c0be 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
|
||||||
@@ -1012,7 +1012,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
@@ -1019,7 +1019,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||||
|
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
|
public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
|
||||||
@ -24,7 +24,7 @@ index 878a79e..687a8e6 100644
|
|||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
index e7b04c2..9ef6ba2 100644
|
index 44d2698..7a6609f 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
@@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
@ -38,7 +38,7 @@ index e7b04c2..9ef6ba2 100644
|
|||||||
|
|
||||||
public CraftPlayer(CraftServer server, EntityPlayer entity) {
|
public CraftPlayer(CraftServer server, EntityPlayer entity) {
|
||||||
super(server, entity);
|
super(server, entity);
|
||||||
@@ -1574,6 +1578,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@@ -1559,6 +1563,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
|
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 4b8f5ca789ee647a2dba593df65f22b8a76f411c Mon Sep 17 00:00:00 2001
|
From b0e1a3ebf7a3ad709836a5edf63d391efc7f2d69 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 4 Mar 2016 18:18:37 -0600
|
Date: Fri, 4 Mar 2016 18:18:37 -0600
|
||||||
Subject: [PATCH] Chunk save queue improvements
|
Subject: [PATCH] Chunk save queue improvements
|
||||||
@ -41,7 +41,7 @@ index 259e3b7..c1a8243 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
index 8828275..996e57f 100644
|
index 9468c5e..b189ee4 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
@@ -12,14 +12,17 @@ import java.util.Map;
|
@@ -12,14 +12,17 @@ import java.util.Map;
|
@ -1,4 +1,4 @@
|
|||||||
From 716634213d675f576b1e196476bcf4380267b36c Mon Sep 17 00:00:00 2001
|
From 16847be93e8fcf69a05f8edf10ca923825a126ca Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 4 Mar 2013 23:46:10 -0500
|
Date: Mon, 4 Mar 2013 23:46:10 -0500
|
||||||
Subject: [PATCH] Chunk Save Reattempt
|
Subject: [PATCH] Chunk Save Reattempt
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
|
|||||||
We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
|
We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
index 996e57f..e2dd95b 100644
|
index b189ee4..192705f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
@@ -182,11 +182,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
@@ -182,11 +182,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
@ -1,4 +1,4 @@
|
|||||||
From 62a1748fca01d80144e90defa25e5d9ff6fadc36 Mon Sep 17 00:00:00 2001
|
From 00becfbfae18231f783587088d82d3f2d67a1965 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 18 Mar 2016 13:17:38 -0400
|
Date: Fri, 18 Mar 2016 13:17:38 -0400
|
||||||
Subject: [PATCH] Default loading permissions.yml before plugins
|
Subject: [PATCH] Default loading permissions.yml before plugins
|
||||||
@ -30,7 +30,7 @@ index c1a8243..88b6778 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index b59b756..7d2d9e2 100644
|
index b7a825a..9913421 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -316,6 +316,7 @@ public final class CraftServer implements Server {
|
@@ -316,6 +316,7 @@ public final class CraftServer implements Server {
|
@ -1,4 +1,4 @@
|
|||||||
From ea764e7810887eefc6a4c52d4977bfd81adad442 Mon Sep 17 00:00:00 2001
|
From 848e2dd10bcb00e9f5f874c93042fd96dfa693d7 Mon Sep 17 00:00:00 2001
|
||||||
From: William <admin@domnian.com>
|
From: William <admin@domnian.com>
|
||||||
Date: Fri, 18 Mar 2016 03:30:17 -0400
|
Date: Fri, 18 Mar 2016 03:30:17 -0400
|
||||||
Subject: [PATCH] Allow Reloading of Custom Permissions
|
Subject: [PATCH] Allow Reloading of Custom Permissions
|
||||||
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
|
|||||||
https://github.com/PaperMC/Paper/issues/49
|
https://github.com/PaperMC/Paper/issues/49
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 7d2d9e2..0693d12 100644
|
index 9913421..f246426 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -1826,4 +1826,21 @@ public final class CraftServer implements Server {
|
@@ -1814,4 +1814,21 @@ public final class CraftServer implements Server {
|
||||||
{
|
{
|
||||||
return spigot;
|
return spigot;
|
||||||
}
|
}
|
@ -1,4 +1,4 @@
|
|||||||
From b6bf708e91cda0ce2d7cb923e75fc94dacdbdb2d Mon Sep 17 00:00:00 2001
|
From 9ae1a095102acfba7a8241abd2d007d854d6cbe4 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 18 Mar 2016 13:50:14 -0400
|
Date: Fri, 18 Mar 2016 13:50:14 -0400
|
||||||
Subject: [PATCH] Remove Metadata on reload
|
Subject: [PATCH] Remove Metadata on reload
|
||||||
@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
|
|||||||
This will remove metadata on reload so it does not crash everything if a plugin uses it.
|
This will remove metadata on reload so it does not crash everything if a plugin uses it.
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 0693d12..f154248 100644
|
index f246426..4fdb3cc 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -739,6 +739,14 @@ public final class CraftServer implements Server {
|
@@ -739,6 +739,14 @@ public final class CraftServer implements Server {
|
@ -1,4 +1,4 @@
|
|||||||
From 48c89f37527f39d4bc234b16769b8f482a35fbe5 Mon Sep 17 00:00:00 2001
|
From 1e899a5dc8e3b0a2a2890efe028aa4e3446d721d Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 18 Mar 2016 14:19:19 -0400
|
Date: Fri, 18 Mar 2016 14:19:19 -0400
|
||||||
Subject: [PATCH] Undead horse leashing
|
Subject: [PATCH] Undead horse leashing
|
@ -1,4 +1,4 @@
|
|||||||
From 07a7621aa33ff2427947824eb0dcafdc3fc77537 Mon Sep 17 00:00:00 2001
|
From 4cf784e306e83da0b91985266d4e416dc3209a07 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 18 Mar 2016 14:24:53 -0400
|
Date: Fri, 18 Mar 2016 14:24:53 -0400
|
||||||
Subject: [PATCH] Fix Furnace cook time bug
|
Subject: [PATCH] Fix Furnace cook time bug
|
@ -1,4 +1,4 @@
|
|||||||
From f5f66d0d6388d120fe4e026e36ab0ebe9d02ece0 Mon Sep 17 00:00:00 2001
|
From c97c3843fcad885235aa9f1f8f8ce5e010103cb6 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 28 May 2015 23:00:19 -0400
|
Date: Thu, 28 May 2015 23:00:19 -0400
|
||||||
Subject: [PATCH] Handle Item Meta Inconsistencies
|
Subject: [PATCH] Handle Item Meta Inconsistencies
|
@ -1,4 +1,4 @@
|
|||||||
From 875d996f5eb2cd385f95f957e18f97a3ac5f68f0 Mon Sep 17 00:00:00 2001
|
From 00cc28aaa400c28ac06cbaecf0220a12b25fa3ed Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 18 Mar 2016 15:12:22 -0400
|
Date: Fri, 18 Mar 2016 15:12:22 -0400
|
||||||
Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
|
Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
|
||||||
@ -24,7 +24,7 @@ index 029eb39..9cce672 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
|
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
|
||||||
index f2317e5..4b01cc0 100644
|
index 65689f2..8cda475 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityArrow.java
|
--- a/src/main/java/net/minecraft/server/EntityArrow.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
|
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
|
||||||
@@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
|
@@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
|
@ -1,4 +1,4 @@
|
|||||||
From 948d3ade5648c450c629839997c0982280f8d8e5 Mon Sep 17 00:00:00 2001
|
From cc7e1be187d727327679ca18327de968873e14cf Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 18 Mar 2016 20:16:03 -0400
|
Date: Fri, 18 Mar 2016 20:16:03 -0400
|
||||||
Subject: [PATCH] Add World Util Methods
|
Subject: [PATCH] Add World Util Methods
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
|
|||||||
Methods that can be used for other patches to help improve logic.
|
Methods that can be used for other patches to help improve logic.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index ad6ad75..7d3770d 100644
|
index ceb0d71..e0e563c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -152,6 +152,12 @@ public abstract class World implements IBlockAccess {
|
@@ -152,6 +152,12 @@ public abstract class World implements IBlockAccess {
|
@ -1,4 +1,4 @@
|
|||||||
From 94e2ca15762051fb10c5b1fd3c20d0010320a799 Mon Sep 17 00:00:00 2001
|
From 2c91ef56fe5b0b2247685411e0c557e7c9166f16 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 18 Mar 2016 21:22:56 -0400
|
Date: Fri, 18 Mar 2016 21:22:56 -0400
|
||||||
Subject: [PATCH] Optimized Light Level Comparisons
|
Subject: [PATCH] Optimized Light Level Comparisons
|
||||||
@ -91,7 +91,7 @@ index c74b628..bb96e16 100644
|
|||||||
|
|
||||||
if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
|
if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
|
diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
|
||||||
index b5c5437..a281957 100644
|
index 3ee5213..59d8bb6 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityMonster.java
|
--- a/src/main/java/net/minecraft/server/EntityMonster.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityMonster.java
|
+++ b/src/main/java/net/minecraft/server/EntityMonster.java
|
||||||
@@ -118,17 +118,17 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
|
@@ -118,17 +118,17 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
|
@ -1,4 +1,4 @@
|
|||||||
From bea3556fa7b29fdf1627b7acd61e4f5f48ea2c59 Mon Sep 17 00:00:00 2001
|
From 6b5bbe53cb6015924619ad76fb68c59ac1d3a14d Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sat, 19 Mar 2016 15:16:54 -0400
|
Date: Sat, 19 Mar 2016 15:16:54 -0400
|
||||||
Subject: [PATCH] Pass world to Village creation
|
Subject: [PATCH] Pass world to Village creation
|
@ -1,11 +1,11 @@
|
|||||||
From 45328410f1076259957edf11907b79c1c284db35 Mon Sep 17 00:00:00 2001
|
From 3360292df03b152c1c4f6d3088c87e3122b70732 Mon Sep 17 00:00:00 2001
|
||||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
Date: Sun, 21 Jun 2015 15:07:20 -0400
|
Date: Sun, 21 Jun 2015 15:07:20 -0400
|
||||||
Subject: [PATCH] Custom replacement for eaten items
|
Subject: [PATCH] Custom replacement for eaten items
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
index fbc20ba..539d016 100644
|
index 42347e7..0f2f250 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
@@ -2340,7 +2340,20 @@ public abstract class EntityLiving extends Entity {
|
@@ -2340,7 +2340,20 @@ public abstract class EntityLiving extends Entity {
|
@ -1,4 +1,4 @@
|
|||||||
From 9ef19d23fd92041aa9c5da721b7253f09c5e64e3 Mon Sep 17 00:00:00 2001
|
From 7616559613d65192dcd5fc9ab8b685a37c8960ca Mon Sep 17 00:00:00 2001
|
||||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
Date: Sun, 19 Jul 2015 16:51:38 -0400
|
Date: Sun, 19 Jul 2015 16:51:38 -0400
|
||||||
Subject: [PATCH] Set health before death event
|
Subject: [PATCH] Set health before death event
|
@ -1,11 +1,11 @@
|
|||||||
From 04b8471c6a6152c2658e668e0431e5e76bc212d9 Mon Sep 17 00:00:00 2001
|
From e8411f0e9e51027d876e84d3d0a810ff187f89b3 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 27 Sep 2015 01:18:02 -0400
|
Date: Sun, 27 Sep 2015 01:18:02 -0400
|
||||||
Subject: [PATCH] handle NaN health/absorb values and repair bad data
|
Subject: [PATCH] handle NaN health/absorb values and repair bad data
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
index 539d016..1eee8a3 100644
|
index 0f2f250..7e0d509 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
@@ -481,7 +481,13 @@ public abstract class EntityLiving extends Entity {
|
@@ -481,7 +481,13 @@ public abstract class EntityLiving extends Entity {
|
||||||
@ -44,10 +44,10 @@ index 539d016..1eee8a3 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
index 9ef6ba2..eba73cf 100644
|
index 7a6609f..1ea595d 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
@@ -1412,6 +1412,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@@ -1397,6 +1397,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRealHealth(double health) {
|
public void setRealHealth(double health) {
|
@ -1,4 +1,4 @@
|
|||||||
From 2ac0bf359dd04900d5cc9abe28b618ee3cd65177 Mon Sep 17 00:00:00 2001
|
From 1900cc9dee6a460ba8d87fd73ee25b43e73af49c Mon Sep 17 00:00:00 2001
|
||||||
From: Daniel Ennis <dennis@icontact.com>
|
From: Daniel Ennis <dennis@icontact.com>
|
||||||
Date: Sun, 20 Mar 2016 15:22:42 -0400
|
Date: Sun, 20 Mar 2016 15:22:42 -0400
|
||||||
Subject: [PATCH] Catch Async PlayerChunkMap operations
|
Subject: [PATCH] Catch Async PlayerChunkMap operations
|
@ -1,4 +1,4 @@
|
|||||||
From bba6f36ded9d5541b4a9370962bddafe36f8f22a Mon Sep 17 00:00:00 2001
|
From d29f3b17dee0a6d823ebfc0debd4aaff105a339d Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Mon, 21 Mar 2016 00:19:18 -0500
|
Date: Mon, 21 Mar 2016 00:19:18 -0500
|
||||||
Subject: [PATCH] Support offline mode in whitelist command as well
|
Subject: [PATCH] Support offline mode in whitelist command as well
|
@ -1,4 +1,4 @@
|
|||||||
From aa51369f8e36ad18e7879bacbb6928a4b09523cb Mon Sep 17 00:00:00 2001
|
From d3bda3ae7d53809fd81ce89d15389679d8ecc6f4 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 5 Jan 2016 21:48:24 -0500
|
Date: Tue, 5 Jan 2016 21:48:24 -0500
|
||||||
Subject: [PATCH] Fix SkullCache case bug
|
Subject: [PATCH] Fix SkullCache case bug
|
@ -1,4 +1,4 @@
|
|||||||
From 06895d6610c5ade61bdc43016d06e08322d3dbf2 Mon Sep 17 00:00:00 2001
|
From c672f11a21481edf3e49ef4c09cf3b402350b29f Mon Sep 17 00:00:00 2001
|
||||||
From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
|
From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
|
||||||
Date: Sat, 19 Mar 2016 22:25:11 +0100
|
Date: Sat, 19 Mar 2016 22:25:11 +0100
|
||||||
Subject: [PATCH] Waving banner workaround
|
Subject: [PATCH] Waving banner workaround
|
@ -1,4 +1,4 @@
|
|||||||
From 7c112d4d93a3caf178493739c38a195c33160c3d Mon Sep 17 00:00:00 2001
|
From 519f8952226e95dde8e2083bb16103c81e35e4bc Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 22 Mar 2016 00:33:47 -0400
|
Date: Tue, 22 Mar 2016 00:33:47 -0400
|
||||||
Subject: [PATCH] Use a Shared Random for Entities
|
Subject: [PATCH] Use a Shared Random for Entities
|
||||||
@ -6,10 +6,10 @@ Subject: [PATCH] Use a Shared Random for Entities
|
|||||||
Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
|
Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index 875dcc8..ae16663 100644
|
index 453efd4..64b682e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -45,6 +45,7 @@ public abstract class Entity implements ICommandListener {
|
@@ -46,6 +46,7 @@ public abstract class Entity implements ICommandListener {
|
||||||
|
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
private static final int CURRENT_LEVEL = 2;
|
private static final int CURRENT_LEVEL = 2;
|
||||||
@ -17,7 +17,7 @@ index 875dcc8..ae16663 100644
|
|||||||
static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
|
static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
|
||||||
return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
|
return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
|
||||||
}
|
}
|
||||||
@@ -160,7 +161,7 @@ public abstract class Entity implements ICommandListener {
|
@@ -163,7 +164,7 @@ public abstract class Entity implements ICommandListener {
|
||||||
this.width = 0.6F;
|
this.width = 0.6F;
|
||||||
this.length = 1.8F;
|
this.length = 1.8F;
|
||||||
this.ax = 1;
|
this.ax = 1;
|
@ -1,4 +1,4 @@
|
|||||||
From 9b15cb205ed349c2902591124e6b009f844aecdc Mon Sep 17 00:00:00 2001
|
From 26efaa8237ce8a3753a799211df5ad4c20625141 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 22 Mar 2016 00:55:23 -0400
|
Date: Tue, 22 Mar 2016 00:55:23 -0400
|
||||||
Subject: [PATCH] Don't teleport dead entities
|
Subject: [PATCH] Don't teleport dead entities
|
||||||
@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic.
|
|||||||
Potentially an old CB change that's no longer needed.
|
Potentially an old CB change that's no longer needed.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index ae16663..d8ebe11 100644
|
index 64b682e..0612618 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -2216,7 +2216,7 @@ public abstract class Entity implements ICommandListener {
|
@@ -2269,7 +2269,7 @@ public abstract class Entity implements ICommandListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
public Entity teleportTo(Location exit, boolean portal) {
|
public Entity teleportTo(Location exit, boolean portal) {
|
@ -1,4 +1,4 @@
|
|||||||
From 7391498a32290021322cfe4879630dcc591308ae Mon Sep 17 00:00:00 2001
|
From 840d96d545551835d72adbdf512de70cf5a22b00 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 27 Aug 2015 01:15:02 -0400
|
Date: Thu, 27 Aug 2015 01:15:02 -0400
|
||||||
Subject: [PATCH] Optimize Chunk Access
|
Subject: [PATCH] Optimize Chunk Access
|
@ -1,4 +1,4 @@
|
|||||||
From 7cd6c9e03ab94fa8b8bf44c9bdceef268dec51e1 Mon Sep 17 00:00:00 2001
|
From f956cdf7c0c12d09a95d78745f88a0a884771142 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Tue, 22 Mar 2016 12:04:28 -0500
|
Date: Tue, 22 Mar 2016 12:04:28 -0500
|
||||||
Subject: [PATCH] Configurable spawn chances for skeleton horses
|
Subject: [PATCH] Configurable spawn chances for skeleton horses
|
||||||
@ -19,7 +19,7 @@ index 9cce672..d92ccc7 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
index 52b70e7..2c75c15 100644
|
index 696f659..564ef79 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
@@ -435,7 +435,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
@@ -435,7 +435,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
@ -1,4 +1,4 @@
|
|||||||
From 9e70da2e8763df71e160fd166200a81608332ba5 Mon Sep 17 00:00:00 2001
|
From 630e43a63942dbef4177ad3354f9fdf677bc4823 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 3 Mar 2016 02:07:55 -0600
|
Date: Thu, 3 Mar 2016 02:07:55 -0600
|
||||||
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
|
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
|
||||||
@ -31,10 +31,10 @@ index d60e755..f772c7c 100644
|
|||||||
public BaseBlockPosition(int i, int j, int k) {
|
public BaseBlockPosition(int i, int j, int k) {
|
||||||
this.a = i;
|
this.a = i;
|
||||||
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
index 5cea6f1..1852972 100644
|
index 67b476b..008ed20 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
@@ -343,6 +343,16 @@ public class BlockPosition extends BaseBlockPosition {
|
@@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition {
|
||||||
protected int b;
|
protected int b;
|
||||||
protected int c;
|
protected int c;
|
||||||
protected int d;
|
protected int d;
|
||||||
@ -98,7 +98,7 @@ index 3d784d0..afdc4a7 100644
|
|||||||
private NibbleArray skyLight;
|
private NibbleArray skyLight;
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 06fb88d..60a55fc 100644
|
index e0e563c..bfb30d9 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -273,12 +273,12 @@ public abstract class World implements IBlockAccess {
|
@@ -273,12 +273,12 @@ public abstract class World implements IBlockAccess {
|
||||||
@ -227,7 +227,7 @@ index 06fb88d..60a55fc 100644
|
|||||||
|
|
||||||
public boolean B() {
|
public boolean B() {
|
||||||
return this.J < 4;
|
return this.J < 4;
|
||||||
@@ -2038,7 +2047,7 @@ public abstract class World implements IBlockAccess {
|
@@ -2020,7 +2029,7 @@ public abstract class World implements IBlockAccess {
|
||||||
public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
|
public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
|
||||||
@Nullable
|
@Nullable
|
||||||
public TileEntity getTileEntity(BlockPosition blockposition) {
|
public TileEntity getTileEntity(BlockPosition blockposition) {
|
||||||
@ -236,7 +236,7 @@ index 06fb88d..60a55fc 100644
|
|||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
@@ -2079,7 +2088,7 @@ public abstract class World implements IBlockAccess {
|
@@ -2061,7 +2070,7 @@ public abstract class World implements IBlockAccess {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
|
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
|
||||||
@ -245,7 +245,7 @@ index 06fb88d..60a55fc 100644
|
|||||||
if (tileentity != null && !tileentity.y()) {
|
if (tileentity != null && !tileentity.y()) {
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
if (captureBlockStates) {
|
if (captureBlockStates) {
|
||||||
@@ -2142,7 +2151,7 @@ public abstract class World implements IBlockAccess {
|
@@ -2124,7 +2133,7 @@ public abstract class World implements IBlockAccess {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean d(BlockPosition blockposition, boolean flag) {
|
public boolean d(BlockPosition blockposition, boolean flag) {
|
@ -1,4 +1,4 @@
|
|||||||
From 27aa9e04eed7118c83df555e0f0509e38094f18d Mon Sep 17 00:00:00 2001
|
From e78b091f4fbf7ba12b78cb0bde720c17554d5578 Mon Sep 17 00:00:00 2001
|
||||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
Date: Tue, 1 Mar 2016 04:32:08 -0500
|
Date: Tue, 1 Mar 2016 04:32:08 -0500
|
||||||
Subject: [PATCH] Fix cooked fish legacy import
|
Subject: [PATCH] Fix cooked fish legacy import
|
@ -1,4 +1,4 @@
|
|||||||
From 24bd2ba47631a8ddefd94a7d2822b5a22d2813e7 Mon Sep 17 00:00:00 2001
|
From e2b0e859ad84a39b58e2b1299ffdd07896afde1e Mon Sep 17 00:00:00 2001
|
||||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
Date: Sun, 20 Mar 2016 06:45:01 -0400
|
Date: Sun, 20 Mar 2016 06:45:01 -0400
|
||||||
Subject: [PATCH] Access items by EquipmentSlot
|
Subject: [PATCH] Access items by EquipmentSlot
|
@ -1,11 +1,11 @@
|
|||||||
From 05023155fb6a414d96f5b04f20ceec957c5e4a3b Mon Sep 17 00:00:00 2001
|
From 4ed00e05204021c2c1d17fd0f5b30812c6eebaf1 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Sun, 27 Mar 2016 20:24:05 -0500
|
Date: Sun, 27 Mar 2016 20:24:05 -0500
|
||||||
Subject: [PATCH] Check async, remove unused vars, GH-159
|
Subject: [PATCH] Check async, remove unused vars, GH-159
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
index 31bafc6..f6e330c 100644
|
index 29219ec..c95fb7f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
@@ -40,6 +40,7 @@ public final class SpawnerCreature {
|
@@ -40,6 +40,7 @@ public final class SpawnerCreature {
|
@ -1,91 +0,0 @@
|
|||||||
From 0af5380a6a18ec3d7c06e7fb4501909b55d2da7b Mon Sep 17 00:00:00 2001
|
|
||||||
From: DemonWav <demonwav@gmail.com>
|
|
||||||
Date: Sat, 26 Mar 2016 21:36:05 -0500
|
|
||||||
Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
|
||||||
index 1852972..93b65cd 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
|
||||||
@@ -158,15 +158,17 @@ public class BlockPosition extends BaseBlockPosition {
|
|
||||||
|
|
||||||
protected BlockPosition a() {
|
|
||||||
if (this.b == null) {
|
|
||||||
- this.b = blockposition;
|
|
||||||
+ this.b = blockposition2; // Paper - use blockposition2 instead of blockposition to prevent infinite loops
|
|
||||||
return this.b;
|
|
||||||
- } else if (this.b.equals(blockposition1)) {
|
|
||||||
+ } else if (this.b.equals(blockposition3)) { // Paper - use blockposition3 instead of blockposition1 to prevent infinite loops
|
|
||||||
return (BlockPosition) this.endOfData();
|
|
||||||
} else {
|
|
||||||
int i = this.b.getX();
|
|
||||||
int j = this.b.getY();
|
|
||||||
int k = this.b.getZ();
|
|
||||||
|
|
||||||
+ // Paper start - use blockposition2 and blockposition3 to prevent infinite loops
|
|
||||||
+ /*
|
|
||||||
if (i < blockposition1.getX()) {
|
|
||||||
++i;
|
|
||||||
} else if (j < blockposition1.getY()) {
|
|
||||||
@@ -177,6 +179,18 @@ public class BlockPosition extends BaseBlockPosition {
|
|
||||||
j = blockposition.getY();
|
|
||||||
++k;
|
|
||||||
}
|
|
||||||
+ */
|
|
||||||
+ if (i < blockposition3.getX()) {
|
|
||||||
+ ++i;
|
|
||||||
+ } else if (j < blockposition3.getY()) {
|
|
||||||
+ i = blockposition2.getX();
|
|
||||||
+ ++j;
|
|
||||||
+ } else if (k < blockposition3.getZ()) {
|
|
||||||
+ i = blockposition2.getX();
|
|
||||||
+ j = blockposition2.getY();
|
|
||||||
+ ++k;
|
|
||||||
+ }
|
|
||||||
+ // Paper end
|
|
||||||
|
|
||||||
this.b = new BlockPosition(i, j, k);
|
|
||||||
return this.b;
|
|
||||||
@@ -206,15 +220,17 @@ public class BlockPosition extends BaseBlockPosition {
|
|
||||||
|
|
||||||
protected BlockPosition.MutableBlockPosition a() {
|
|
||||||
if (this.b == null) {
|
|
||||||
- this.b = new BlockPosition.MutableBlockPosition(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
||||||
+ this.b = new BlockPosition.MutableBlockPosition(blockposition2.getX(), blockposition2.getY(), blockposition2.getZ()); // Paper - use blockposition2 instead of blockposition to prevent infinite loops
|
|
||||||
return this.b;
|
|
||||||
- } else if (this.b.equals(blockposition1)) {
|
|
||||||
+ } else if (this.b.equals(blockposition3)) { // Paper - use blockposition3 instead of blockposition1 to prevent infinite loops
|
|
||||||
return (BlockPosition.MutableBlockPosition) this.endOfData();
|
|
||||||
} else {
|
|
||||||
int i = this.b.getX();
|
|
||||||
int j = this.b.getY();
|
|
||||||
int k = this.b.getZ();
|
|
||||||
|
|
||||||
+ // Paper start - use blockposition2 and blockposition3 to prevent infinite loops
|
|
||||||
+ /*
|
|
||||||
if (i < blockposition1.getX()) {
|
|
||||||
++i;
|
|
||||||
} else if (j < blockposition1.getY()) {
|
|
||||||
@@ -225,6 +241,18 @@ public class BlockPosition extends BaseBlockPosition {
|
|
||||||
j = blockposition.getY();
|
|
||||||
++k;
|
|
||||||
}
|
|
||||||
+ */
|
|
||||||
+ if (i < blockposition3.getX()) {
|
|
||||||
+ ++i;
|
|
||||||
+ } else if (j < blockposition3.getY()) {
|
|
||||||
+ i = blockposition2.getX();
|
|
||||||
+ ++j;
|
|
||||||
+ } else if (k < blockposition3.getZ()) {
|
|
||||||
+ i = blockposition2.getX();
|
|
||||||
+ j = blockposition2.getY();
|
|
||||||
+ ++k;
|
|
||||||
+ }
|
|
||||||
+ // Paper end
|
|
||||||
|
|
||||||
this.b.b = i;
|
|
||||||
this.b.c = j;
|
|
||||||
--
|
|
||||||
2.9.3
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 8152281862b9dd18cd83d50a25445213da0aa6d4 Mon Sep 17 00:00:00 2001
|
From 982998dd8173683b1421ad89314de7661077d332 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 28 Mar 2016 19:55:45 -0400
|
Date: Mon, 28 Mar 2016 19:55:45 -0400
|
||||||
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
|
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
|
||||||
@ -25,7 +25,7 @@ index d92ccc7..298c48f 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 8ca33d0..019b185 100644
|
index bfb30d9..1f12ff5 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess {
|
@@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess {
|
||||||
@ -38,7 +38,7 @@ index 8ca33d0..019b185 100644
|
|||||||
this.getServer().getPluginManager().callEvent(event);
|
this.getServer().getPluginManager().callEvent(event);
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
index 2c75c15..f04486e 100644
|
index 564ef79..5bf7df7 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
@@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
|
@@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
|
@ -1,11 +1,11 @@
|
|||||||
From 3c45541cf46e3cf358d90f9ddb03777d75f6afe0 Mon Sep 17 00:00:00 2001
|
From e09b7acbdcfdb399602433af50a246e2bcbfb276 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 28 Mar 2016 20:32:58 -0400
|
Date: Mon, 28 Mar 2016 20:32:58 -0400
|
||||||
Subject: [PATCH] Entity AddTo/RemoveFrom World Events
|
Subject: [PATCH] Entity AddTo/RemoveFrom World Events
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 6ac16a8..b0f369d 100644
|
index 1f12ff5..dd4634e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -1180,6 +1180,7 @@ public abstract class World implements IBlockAccess {
|
@@ -1180,6 +1180,7 @@ public abstract class World implements IBlockAccess {
|
@ -1,4 +1,4 @@
|
|||||||
From a965153e8399e27c9de94c80a44bb9ddefa2fcec Mon Sep 17 00:00:00 2001
|
From de134ec4838b131a802ae6e75f7d805bb54b0566 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 28 Mar 2016 20:46:14 -0400
|
Date: Mon, 28 Mar 2016 20:46:14 -0400
|
||||||
Subject: [PATCH] Configurable Chunk Inhabited Timer
|
Subject: [PATCH] Configurable Chunk Inhabited Timer
|
@ -1,4 +1,4 @@
|
|||||||
From bfadeb0838decd794069106ce6357842b140ea06 Mon Sep 17 00:00:00 2001
|
From 3dc7b052ab904452c72af7ec8494566f09c289dc Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 28 Mar 2016 21:22:26 -0400
|
Date: Mon, 28 Mar 2016 21:22:26 -0400
|
||||||
Subject: [PATCH] EntityPathfindEvent
|
Subject: [PATCH] EntityPathfindEvent
|
@ -1,4 +1,4 @@
|
|||||||
From cf17689530a155b1d3d0e45c72430be7d603cde0 Mon Sep 17 00:00:00 2001
|
From eb71eace887b2e0a81bc89f494f250fc0a37a4f5 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 28 Mar 2016 22:03:09 -0400
|
Date: Mon, 28 Mar 2016 22:03:09 -0400
|
||||||
Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
|
Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
|
@ -1,4 +1,4 @@
|
|||||||
From 26ec2b878c8559f55150b3df075119d3ef289f25 Mon Sep 17 00:00:00 2001
|
From dc00f1adf650e8c591f1c67718fb12cabcf1d18b Mon Sep 17 00:00:00 2001
|
||||||
From: Antony Riley <antony@cyberiantiger.org>
|
From: Antony Riley <antony@cyberiantiger.org>
|
||||||
Date: Tue, 29 Mar 2016 06:56:23 +0300
|
Date: Tue, 29 Mar 2016 06:56:23 +0300
|
||||||
Subject: [PATCH] Reduce IO ops opening a new region file.
|
Subject: [PATCH] Reduce IO ops opening a new region file.
|
@ -1,4 +1,4 @@
|
|||||||
From 90af70dc2eb3165b306dab7c34fcb4f2c04646ba Mon Sep 17 00:00:00 2001
|
From fd306dc01da01d4bbcaa757e79a5bfacfad90509 Mon Sep 17 00:00:00 2001
|
||||||
From: Antony Riley <antony@cyberiantiger.org>
|
From: Antony Riley <antony@cyberiantiger.org>
|
||||||
Date: Tue, 29 Mar 2016 08:22:55 +0300
|
Date: Tue, 29 Mar 2016 08:22:55 +0300
|
||||||
Subject: [PATCH] Sanitise RegionFileCache and make configurable.
|
Subject: [PATCH] Sanitise RegionFileCache and make configurable.
|
@ -1,11 +1,11 @@
|
|||||||
From 74b44807f14bbcfb54136ec5af81eaa1e061a950 Mon Sep 17 00:00:00 2001
|
From 8ddafeefaeaf97373c2a76e463716b223bd730fa Mon Sep 17 00:00:00 2001
|
||||||
From: DemonWav <demonwav@gmail.com>
|
From: DemonWav <demonwav@gmail.com>
|
||||||
Date: Wed, 30 Mar 2016 01:20:11 -0500
|
Date: Wed, 30 Mar 2016 01:20:11 -0500
|
||||||
Subject: [PATCH] Add getEntity by UUID API
|
Subject: [PATCH] Add getEntity by UUID API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index a872e76..3339985 100644
|
index 2456e33..fc433f9 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -1521,6 +1521,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
@@ -1521,6 +1521,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||||
@ -26,7 +26,7 @@ index a872e76..3339985 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index f154248..5614147 100644
|
index 4fdb3cc..764b6d7 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -53,6 +53,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
|
@@ -53,6 +53,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
|
||||||
@ -37,7 +37,7 @@ index f154248..5614147 100644
|
|||||||
import org.bukkit.craftbukkit.entity.CraftPlayer;
|
import org.bukkit.craftbukkit.entity.CraftPlayer;
|
||||||
import org.bukkit.craftbukkit.generator.CraftChunkData;
|
import org.bukkit.craftbukkit.generator.CraftChunkData;
|
||||||
import org.bukkit.craftbukkit.help.SimpleHelpMap;
|
import org.bukkit.craftbukkit.help.SimpleHelpMap;
|
||||||
@@ -1850,5 +1851,14 @@ public final class CraftServer implements Server {
|
@@ -1838,5 +1839,14 @@ public final class CraftServer implements Server {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,4 +1,4 @@
|
|||||||
From 5f74f4b584ca2388c4e5aed9dfb08cac40f941f1 Mon Sep 17 00:00:00 2001
|
From bcf0f8cce8edf3181863e5e35b2879c2d884de24 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 30 Mar 2016 02:13:24 -0400
|
Date: Wed, 30 Mar 2016 02:13:24 -0400
|
||||||
Subject: [PATCH] Use Optimized Collections
|
Subject: [PATCH] Use Optimized Collections
|
@ -1,4 +1,4 @@
|
|||||||
From 73380b1eaea2bd41dc6e9f792b06c45ff1c5661d Mon Sep 17 00:00:00 2001
|
From ea74d4759a983c7da708fbf2e930381ab2b54228 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 31 Mar 2016 19:17:58 -0400
|
Date: Thu, 31 Mar 2016 19:17:58 -0400
|
||||||
Subject: [PATCH] Do not load chunks for light checks
|
Subject: [PATCH] Do not load chunks for light checks
|
||||||
@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
|
|||||||
(certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
|
(certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 2f92c78..2374a14 100644
|
index dd4634e..26166bd 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -759,6 +759,7 @@ public abstract class World implements IBlockAccess {
|
@@ -759,6 +759,7 @@ public abstract class World implements IBlockAccess {
|
@ -1,4 +1,4 @@
|
|||||||
From e8e000b9e0e53bc3834ae69d60d59bcbbf27755f Mon Sep 17 00:00:00 2001
|
From 6a3f20ec137e08c421a3351213338b0d35610016 Mon Sep 17 00:00:00 2001
|
||||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
Date: Sat, 2 Apr 2016 05:09:16 -0400
|
Date: Sat, 2 Apr 2016 05:09:16 -0400
|
||||||
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
|
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
|
||||||
@ -18,10 +18,10 @@ index c67cb54..521f462 100644
|
|||||||
private Vec3D c;
|
private Vec3D c;
|
||||||
private EnumHand d;
|
private EnumHand d;
|
||||||
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 687a8e6..1f0047b 100644
|
index b42c0be..a376a0e 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
|
||||||
@@ -1598,6 +1598,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
@@ -1605,6 +1605,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,11 +1,11 @@
|
|||||||
From 18bd0f26a2508867740717cd8c4f44dd74c94558 Mon Sep 17 00:00:00 2001
|
From efdd99dd7957200659226404af74d6ac7199ce2c Mon Sep 17 00:00:00 2001
|
||||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
Date: Sat, 2 Apr 2016 20:37:03 -0400
|
Date: Sat, 2 Apr 2016 20:37:03 -0400
|
||||||
Subject: [PATCH] Fix reducedDebugInfo not initialized on client
|
Subject: [PATCH] Fix reducedDebugInfo not initialized on client
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
index 954d035..87740c2 100644
|
index 54762ff..2af702c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
@@ -154,6 +154,7 @@ public abstract class PlayerList {
|
@@ -154,6 +154,7 @@ public abstract class PlayerList {
|
@ -1,4 +1,4 @@
|
|||||||
From 5db46b601603e6d1968ec56ed2c3f898d1704700 Mon Sep 17 00:00:00 2001
|
From 6f9b0a8a2bb769a5403e218228873df3833f2dc3 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 3 Apr 2016 16:28:17 -0400
|
Date: Sun, 3 Apr 2016 16:28:17 -0400
|
||||||
Subject: [PATCH] Configurable Grass Spread Tick Rate
|
Subject: [PATCH] Configurable Grass Spread Tick Rate
|
@ -1,4 +1,4 @@
|
|||||||
From 6e335d3055b2dea8a69d1f3a1bf95ec6fd83d341 Mon Sep 17 00:00:00 2001
|
From 8f7a21dbb05376414fe4a0dd515a4f28856fcea9 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sat, 13 Sep 2014 23:14:43 -0400
|
Date: Sat, 13 Sep 2014 23:14:43 -0400
|
||||||
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
|
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
|
||||||
@ -21,7 +21,7 @@ index 615a6af..6517c32 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 3339985..4cb71eb 100644
|
index fc433f9..2fc3e94 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -352,8 +352,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
@@ -352,8 +352,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||||
@ -39,10 +39,10 @@ index 3339985..4cb71eb 100644
|
|||||||
|
|
||||||
if (i1 - j > 1000L) {
|
if (i1 - j > 1000L) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 0716198..01058a9 100644
|
index 26166bd..fa92054 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -3215,8 +3215,9 @@ public abstract class World implements IBlockAccess {
|
@@ -3197,8 +3197,9 @@ public abstract class World implements IBlockAccess {
|
||||||
int k = i * 16 + 8 - blockposition.getX();
|
int k = i * 16 + 8 - blockposition.getX();
|
||||||
int l = j * 16 + 8 - blockposition.getZ();
|
int l = j * 16 + 8 - blockposition.getZ();
|
||||||
boolean flag = true;
|
boolean flag = true;
|
||||||
@ -54,7 +54,7 @@ index 0716198..01058a9 100644
|
|||||||
|
|
||||||
public void a(Packet<?> packet) {
|
public void a(Packet<?> packet) {
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 5614147..f107221 100644
|
index 764b6d7..79ee561 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -951,7 +951,7 @@ public final class CraftServer implements Server {
|
@@ -951,7 +951,7 @@ public final class CraftServer implements Server {
|
@ -1,11 +1,11 @@
|
|||||||
From 3fdb1dae891799dd98d2a288e12a3efc279ae9d6 Mon Sep 17 00:00:00 2001
|
From ae73bd2fe9bb25c99c9998c1894dd500fa831836 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 3 Apr 2016 17:48:50 -0400
|
Date: Sun, 3 Apr 2016 17:48:50 -0400
|
||||||
Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
|
Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 841a6c7..46b1323 100644
|
index fa92054..70cd195 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -532,6 +532,7 @@ public abstract class World implements IBlockAccess {
|
@@ -532,6 +532,7 @@ public abstract class World implements IBlockAccess {
|
@ -1,14 +1,14 @@
|
|||||||
From 4feb279f6e509fd05c7527eb936a534168481a71 Mon Sep 17 00:00:00 2001
|
From c15ffc7835e107600a83dacbdf2265e7287e5905 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 5 Apr 2016 19:42:22 -0400
|
Date: Tue, 5 Apr 2016 19:42:22 -0400
|
||||||
Subject: [PATCH] Don't spam reload spawn chunks in nether/end
|
Subject: [PATCH] Don't spam reload spawn chunks in nether/end
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index e52791e..0c460b1 100644
|
index 70cd195..2e686ae 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -3211,6 +3211,7 @@ public abstract class World implements IBlockAccess {
|
@@ -3193,6 +3193,7 @@ public abstract class World implements IBlockAccess {
|
||||||
return this.N;
|
return this.N;
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From de9aae490f42cda27e08d99884b4b4e4fe6b1d0d Mon Sep 17 00:00:00 2001
|
From f5052f0ab3d6f3dca63bde76e1219434619430e6 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 5 Apr 2016 21:38:58 -0400
|
Date: Tue, 5 Apr 2016 21:38:58 -0400
|
||||||
Subject: [PATCH] Remove Debug checks from DataBits
|
Subject: [PATCH] Remove Debug checks from DataBits
|
@ -1,4 +1,4 @@
|
|||||||
From 9f87cd16312f919435c50acadbc36a728e503a08 Mon Sep 17 00:00:00 2001
|
From 770da0e07c4eab5c4420fde8e767ba9e4e18d80f Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Wed, 6 Apr 2016 01:04:23 -0500
|
Date: Wed, 6 Apr 2016 01:04:23 -0500
|
||||||
Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
|
Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
|
||||||
@ -19,10 +19,10 @@ index 6517c32..ea254a7 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index d8ebe11..2d0e132 100644
|
index 0612618..d594dd6 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -1949,6 +1949,7 @@ public abstract class Entity implements ICommandListener {
|
@@ -2002,6 +2002,7 @@ public abstract class Entity implements ICommandListener {
|
||||||
return this.getFlag(5);
|
return this.getFlag(5);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,10 +31,10 @@ index d8ebe11..2d0e132 100644
|
|||||||
public ScoreboardTeamBase aQ() {
|
public ScoreboardTeamBase aQ() {
|
||||||
if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
|
if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
|
||||||
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 1f0047b..00135cc 100644
|
index a376a0e..3a99311 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
|
||||||
@@ -1331,7 +1331,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
@@ -1338,7 +1338,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 1fa6dccda9721bf0c1eb8aecb6440b914c6f37ad Mon Sep 17 00:00:00 2001
|
From cddf4caa7f3d36be3b5de9afd725b6b6cceb4b42 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Sun, 10 Apr 2016 03:23:32 -0500
|
Date: Sun, 10 Apr 2016 03:23:32 -0500
|
||||||
Subject: [PATCH] Workaround for setting passengers on players
|
Subject: [PATCH] Workaround for setting passengers on players
|
||||||
@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
|
|||||||
SPIGOT-1915 & GH-114
|
SPIGOT-1915 & GH-114
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
index eba73cf..f16fe84 100644
|
index 1ea595d..eaf7954 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
@@ -602,6 +602,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@@ -587,6 +587,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 71f1926723e388cc370e8b45ee1f65836a99cc61 Mon Sep 17 00:00:00 2001
|
From 7b9087f509a179e0f0f8ccff52552ac94970a8ba Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 13 Apr 2016 00:25:28 -0400
|
Date: Wed, 13 Apr 2016 00:25:28 -0400
|
||||||
Subject: [PATCH] Remove unused World Tile Entity List
|
Subject: [PATCH] Remove unused World Tile Entity List
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
|
|||||||
Massive hit to performance and it is completely unnecessary.
|
Massive hit to performance and it is completely unnecessary.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 0c460b1..0e2176e 100644
|
index 2e686ae..7ab4f45 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
|
@@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
|
||||||
@ -18,7 +18,7 @@ index 0c460b1..0e2176e 100644
|
|||||||
public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
|
public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
|
||||||
private final List<TileEntity> b = Lists.newArrayList();
|
private final List<TileEntity> b = Lists.newArrayList();
|
||||||
private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
|
private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
|
||||||
@@ -1590,7 +1590,7 @@ public abstract class World implements IBlockAccess {
|
@@ -1572,7 +1572,7 @@ public abstract class World implements IBlockAccess {
|
||||||
// CraftBukkit start - From below, clean up tile entities before ticking them
|
// CraftBukkit start - From below, clean up tile entities before ticking them
|
||||||
if (!this.tileEntityListUnload.isEmpty()) {
|
if (!this.tileEntityListUnload.isEmpty()) {
|
||||||
this.tileEntityListTick.removeAll(this.tileEntityListUnload);
|
this.tileEntityListTick.removeAll(this.tileEntityListUnload);
|
||||||
@ -27,7 +27,7 @@ index 0c460b1..0e2176e 100644
|
|||||||
this.tileEntityListUnload.clear();
|
this.tileEntityListUnload.clear();
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
@@ -1641,7 +1641,7 @@ public abstract class World implements IBlockAccess {
|
@@ -1623,7 +1623,7 @@ public abstract class World implements IBlockAccess {
|
||||||
if (tileentity.y()) {
|
if (tileentity.y()) {
|
||||||
tilesThisCycle--;
|
tilesThisCycle--;
|
||||||
this.tileEntityListTick.remove(tileTickPosition--);
|
this.tileEntityListTick.remove(tileTickPosition--);
|
||||||
@ -36,7 +36,7 @@ index 0c460b1..0e2176e 100644
|
|||||||
if (this.isLoaded(tileentity.getPosition())) {
|
if (this.isLoaded(tileentity.getPosition())) {
|
||||||
this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
|
this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
|
||||||
}
|
}
|
||||||
@@ -1679,7 +1679,7 @@ public abstract class World implements IBlockAccess {
|
@@ -1661,7 +1661,7 @@ public abstract class World implements IBlockAccess {
|
||||||
this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
|
this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
// From above, don't screw this up - SPIGOT-1746
|
// From above, don't screw this up - SPIGOT-1746
|
||||||
@ -45,7 +45,7 @@ index 0c460b1..0e2176e 100644
|
|||||||
this.a(tileentity1);
|
this.a(tileentity1);
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
@@ -1699,9 +1699,9 @@ public abstract class World implements IBlockAccess {
|
@@ -1681,9 +1681,9 @@ public abstract class World implements IBlockAccess {
|
||||||
protected void l() {}
|
protected void l() {}
|
||||||
|
|
||||||
public boolean a(TileEntity tileentity) {
|
public boolean a(TileEntity tileentity) {
|
||||||
@ -57,7 +57,7 @@ index 0c460b1..0e2176e 100644
|
|||||||
this.tileEntityListTick.add(tileentity);
|
this.tileEntityListTick.add(tileentity);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2135,7 +2135,7 @@ public abstract class World implements IBlockAccess {
|
@@ -2117,7 +2117,7 @@ public abstract class World implements IBlockAccess {
|
||||||
} else {
|
} else {
|
||||||
if (tileentity != null) {
|
if (tileentity != null) {
|
||||||
this.b.remove(tileentity);
|
this.b.remove(tileentity);
|
@ -1,4 +1,4 @@
|
|||||||
From e07b3c609ad811d3fce71bafc7ccc0694b3289ce Mon Sep 17 00:00:00 2001
|
From 4f5fa0bf7fb883ea2d79b49add0e696be0adfeaf Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 13 Apr 2016 00:30:10 -0400
|
Date: Wed, 13 Apr 2016 00:30:10 -0400
|
||||||
Subject: [PATCH] Don't tick Skulls - unused code
|
Subject: [PATCH] Don't tick Skulls - unused code
|
@ -1,4 +1,4 @@
|
|||||||
From 3ed2f46a1d5ad43cef080a52b198425b73458377 Mon Sep 17 00:00:00 2001
|
From 024f56067df9c81b3dc1b69836311755d59d7680 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 13 Apr 2016 02:10:49 -0400
|
Date: Wed, 13 Apr 2016 02:10:49 -0400
|
||||||
Subject: [PATCH] Configurable Player Collision
|
Subject: [PATCH] Configurable Player Collision
|
||||||
@ -37,7 +37,7 @@ index ab9aa13..f9f59e5 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 4cb71eb..6f2cf4b 100644
|
index 2fc3e94..8b94120 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -327,6 +327,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
@@ -327,6 +327,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||||
@ -75,7 +75,7 @@ index d8ec504..eb45d3c 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
index 87740c2..981c31f 100644
|
index 2af702c..b14d4cb 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
@@ -71,6 +71,7 @@ public abstract class PlayerList {
|
@@ -71,6 +71,7 @@ public abstract class PlayerList {
|
||||||
@ -86,7 +86,7 @@ index 87740c2..981c31f 100644
|
|||||||
|
|
||||||
public PlayerList(MinecraftServer minecraftserver) {
|
public PlayerList(MinecraftServer minecraftserver) {
|
||||||
this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
|
this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
|
||||||
@@ -236,6 +237,12 @@ public abstract class PlayerList {
|
@@ -228,6 +229,12 @@ public abstract class PlayerList {
|
||||||
}
|
}
|
||||||
|
|
||||||
entityplayer.syncInventory();
|
entityplayer.syncInventory();
|
||||||
@ -99,7 +99,7 @@ index 87740c2..981c31f 100644
|
|||||||
// CraftBukkit - Moved from above, added world
|
// CraftBukkit - Moved from above, added world
|
||||||
PlayerList.f.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "]" + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
|
PlayerList.f.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "]" + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
|
||||||
}
|
}
|
||||||
@@ -406,6 +413,16 @@ public abstract class PlayerList {
|
@@ -399,6 +406,16 @@ public abstract class PlayerList {
|
||||||
entityplayer.playerTick();// SPIGOT-924
|
entityplayer.playerTick();// SPIGOT-924
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
@ -116,7 +116,7 @@ index 87740c2..981c31f 100644
|
|||||||
this.savePlayerFile(entityplayer);
|
this.savePlayerFile(entityplayer);
|
||||||
if (entityplayer.isPassenger()) {
|
if (entityplayer.isPassenger()) {
|
||||||
Entity entity = entityplayer.getVehicle();
|
Entity entity = entityplayer.getVehicle();
|
||||||
@@ -1319,7 +1336,13 @@ public abstract class PlayerList {
|
@@ -1312,7 +1329,13 @@ public abstract class PlayerList {
|
||||||
player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
|
player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
@ -1,4 +1,4 @@
|
|||||||
From e5e479460bd567fb43957512e40870585b5e1ff6 Mon Sep 17 00:00:00 2001
|
From f803c68f46d30c10dda07eacea30e5c60243b658 Mon Sep 17 00:00:00 2001
|
||||||
From: kashike <kashike@vq.lc>
|
From: kashike <kashike@vq.lc>
|
||||||
Date: Wed, 13 Apr 2016 20:21:38 -0700
|
Date: Wed, 13 Apr 2016 20:21:38 -0700
|
||||||
Subject: [PATCH] Add handshake event to allow plugins to handle client
|
Subject: [PATCH] Add handshake event to allow plugins to handle client
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
|
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
|
||||||
index d29796a..d84ac87 100644
|
index c1ed460..492a0c5 100644
|
||||||
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
|
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
|
||||||
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
|
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
|
||||||
@@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
|
@@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
|
@ -1,4 +1,4 @@
|
|||||||
From 7ea77c7bbcea4714f13d0aaed96d3ca96fc56bac Mon Sep 17 00:00:00 2001
|
From 5a9cea8d05b30aecdb586a5c81fd6eeb5c107fdf Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Thu, 14 Apr 2016 17:48:56 -0500
|
Date: Thu, 14 Apr 2016 17:48:56 -0500
|
||||||
Subject: [PATCH] Water mobs should only spawn in the water
|
Subject: [PATCH] Water mobs should only spawn in the water
|
@ -1,4 +1,4 @@
|
|||||||
From 80459847413a5107bc062d6f65b2da71fdd32eac Mon Sep 17 00:00:00 2001
|
From a9fd44ef1436a725ebe60a5ca1230e01c231560b Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 14 Apr 2016 21:01:39 -0400
|
Date: Thu, 14 Apr 2016 21:01:39 -0400
|
||||||
Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
|
Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
|
||||||
@ -27,7 +27,7 @@ index 61d34fc..a6cf1d8 100644
|
|||||||
if (entity instanceof EntityItem) {
|
if (entity instanceof EntityItem) {
|
||||||
itemCounts[i]--;
|
itemCounts[i]--;
|
||||||
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
index f6e330c..c1f6e63 100644
|
index c95fb7f..0a7a310 100644
|
||||||
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
@@ -23,6 +23,15 @@ public final class SpawnerCreature {
|
@@ -23,6 +23,15 @@ public final class SpawnerCreature {
|
@ -1,4 +1,4 @@
|
|||||||
From 003148da08b283ba0b1696222927cd1c8fe77207 Mon Sep 17 00:00:00 2001
|
From 6853c3611af7ac1107959451fcf1d33684853f97 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sat, 16 Apr 2016 00:39:33 -0400
|
Date: Sat, 16 Apr 2016 00:39:33 -0400
|
||||||
Subject: [PATCH] Configurable RCON IP address
|
Subject: [PATCH] Configurable RCON IP address
|
@ -1,4 +1,4 @@
|
|||||||
From 8b872363b4ed115d482f83f4328fa444192dfe17 Mon Sep 17 00:00:00 2001
|
From 1e7f0732a42a20adb87656e9223e1f5923d28912 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 17 Apr 2016 17:27:09 -0400
|
Date: Sun, 17 Apr 2016 17:27:09 -0400
|
||||||
Subject: [PATCH] Prevent Fire from loading chunks
|
Subject: [PATCH] Prevent Fire from loading chunks
|
@ -1,11 +1,11 @@
|
|||||||
From 99367ba5827ada166fb56b27aaad03f3ed4290db Mon Sep 17 00:00:00 2001
|
From 952a91604c23b7d171c80d06e38235a38e9bfae4 Mon Sep 17 00:00:00 2001
|
||||||
From: Isaac Moore <rmsy@me.com>
|
From: Isaac Moore <rmsy@me.com>
|
||||||
Date: Tue, 19 Apr 2016 14:09:31 -0500
|
Date: Tue, 19 Apr 2016 14:09:31 -0500
|
||||||
Subject: [PATCH] Implement PlayerLocaleChangeEvent
|
Subject: [PATCH] Implement PlayerLocaleChangeEvent
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index 9662ea0..518283f 100644
|
index 2c8a21e..182c0bb 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -28,7 +28,7 @@ import org.bukkit.inventory.MainHand;
|
@@ -28,7 +28,7 @@ import org.bukkit.inventory.MainHand;
|
||||||
@ -17,7 +17,7 @@ index 9662ea0..518283f 100644
|
|||||||
public PlayerConnection playerConnection;
|
public PlayerConnection playerConnection;
|
||||||
public final MinecraftServer server;
|
public final MinecraftServer server;
|
||||||
public final PlayerInteractManager playerInteractManager;
|
public final PlayerInteractManager playerInteractManager;
|
||||||
@@ -1071,7 +1071,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -1088,7 +1088,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
this.server.server.getPluginManager().callEvent(event);
|
this.server.server.getPluginManager().callEvent(event);
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
@ -34,10 +34,10 @@ index 9662ea0..518283f 100644
|
|||||||
this.ch = packetplayinsettings.d();
|
this.ch = packetplayinsettings.d();
|
||||||
this.getDataWatcher().set(EntityPlayer.bq, Byte.valueOf((byte) packetplayinsettings.e()));
|
this.getDataWatcher().set(EntityPlayer.bq, Byte.valueOf((byte) packetplayinsettings.e()));
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
index f16fe84..72bf7fd 100644
|
index eaf7954..3edeb49 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
@@ -1705,7 +1705,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@@ -1690,7 +1690,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
@Override
|
@Override
|
||||||
public String getLocale()
|
public String getLocale()
|
||||||
{
|
{
|
@ -1,4 +1,4 @@
|
|||||||
From 21c7e1d110079977290a2966af83b112bce373a5 Mon Sep 17 00:00:00 2001
|
From 2817475c6f24e5080e7172f6f4e2faf8748dceb1 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Fri, 22 Apr 2016 01:43:11 -0500
|
Date: Fri, 22 Apr 2016 01:43:11 -0500
|
||||||
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
|
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
|
|||||||
Don't even get me started
|
Don't even get me started
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
index 1eee8a3..9a86d84 100644
|
index 7e0d509..87c39c9 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
@@ -761,10 +761,16 @@ public abstract class EntityLiving extends Entity {
|
@@ -761,10 +761,16 @@ public abstract class EntityLiving extends Entity {
|
@ -1,4 +1,4 @@
|
|||||||
From 301c48afe1476bca3793c13900cd0ee0e431d9f1 Mon Sep 17 00:00:00 2001
|
From c12af4cb4b783527f0836975ede8f153756bfb9a Mon Sep 17 00:00:00 2001
|
||||||
From: kashike <kashike@vq.lc>
|
From: kashike <kashike@vq.lc>
|
||||||
Date: Thu, 21 Apr 2016 23:51:55 -0700
|
Date: Thu, 21 Apr 2016 23:51:55 -0700
|
||||||
Subject: [PATCH] Add ability to configure frosted_ice properties
|
Subject: [PATCH] Add ability to configure frosted_ice properties
|
@ -1,14 +1,14 @@
|
|||||||
From 08a96c69d9c2893a37e6bd71b65f1c48096b8485 Mon Sep 17 00:00:00 2001
|
From 0ad7ae5cfa417df14a045c10ebc7891bc3978d09 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Fri, 22 Apr 2016 18:20:05 -0500
|
Date: Fri, 22 Apr 2016 18:20:05 -0500
|
||||||
Subject: [PATCH] Vehicle Event Cancellation Changes
|
Subject: [PATCH] Vehicle Event Cancellation Changes
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index 2d0e132..b0cdce1 100644
|
index d594dd6..78b3b3a 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -1754,6 +1754,10 @@ public abstract class Entity implements ICommandListener {
|
@@ -1807,6 +1807,10 @@ public abstract class Entity implements ICommandListener {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ index 2d0e132..b0cdce1 100644
|
|||||||
if (!flag && (!this.n(entity) || !entity.q(this))) {
|
if (!flag && (!this.n(entity) || !entity.q(this))) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
@@ -1762,7 +1766,7 @@ public abstract class Entity implements ICommandListener {
|
@@ -1815,7 +1819,7 @@ public abstract class Entity implements ICommandListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.au = entity;
|
this.au = entity;
|
||||||
@ -28,7 +28,7 @@ index 2d0e132..b0cdce1 100644
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1789,12 +1793,20 @@ public abstract class Entity implements ICommandListener {
|
@@ -1842,12 +1846,20 @@ public abstract class Entity implements ICommandListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void o(Entity entity) {
|
protected void o(Entity entity) {
|
||||||
@ -49,7 +49,7 @@ index 2d0e132..b0cdce1 100644
|
|||||||
CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
|
CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
|
||||||
Entity orig = craft == null ? null : craft.getHandle();
|
Entity orig = craft == null ? null : craft.getHandle();
|
||||||
if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, false)) { // Boolean not used
|
if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, false)) { // Boolean not used
|
||||||
@@ -1817,6 +1829,8 @@ public abstract class Entity implements ICommandListener {
|
@@ -1870,6 +1882,8 @@ public abstract class Entity implements ICommandListener {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Spigot end
|
// Spigot end
|
||||||
@ -58,7 +58,7 @@ index 2d0e132..b0cdce1 100644
|
|||||||
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bw() instanceof EntityHuman)) {
|
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bw() instanceof EntityHuman)) {
|
||||||
this.passengers.add(0, entity);
|
this.passengers.add(0, entity);
|
||||||
} else {
|
} else {
|
||||||
@@ -1842,16 +1856,29 @@ public abstract class Entity implements ICommandListener {
|
@@ -1895,16 +1909,29 @@ public abstract class Entity implements ICommandListener {
|
||||||
CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
|
CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
|
||||||
Entity n = craftn == null ? null : craftn.getHandle();
|
Entity n = craftn == null ? null : craftn.getHandle();
|
||||||
if (event.isCancelled() || n != orig) {
|
if (event.isCancelled() || n != orig) {
|
@ -1,4 +1,4 @@
|
|||||||
From d5f47de464e17bc91048e94aaf1de0b539729527 Mon Sep 17 00:00:00 2001
|
From f4417caf2ef943f482ec13ee77a622de815326e0 Mon Sep 17 00:00:00 2001
|
||||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
Date: Fri, 4 Mar 2016 03:16:11 -0500
|
Date: Fri, 4 Mar 2016 03:16:11 -0500
|
||||||
Subject: [PATCH] Arrow pickup rule API
|
Subject: [PATCH] Arrow pickup rule API
|
Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden Mehr anzeigen
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren