Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-22 06:20:06 +01:00
Update upstream
Dieser Commit ist enthalten in:
Ursprung
23ed74032c
Commit
48d75228ed
Spigot-API-Patches
0003-Timings-v2.patch0005-Add-getTPS-method.patch0013-Expose-server-CommandMap.patch0024-Add-command-to-reload-permissions.yml-and-require-co.patch0038-Allow-Reloading-of-Command-Aliases.patch0049-Add-configuration-option-to-prevent-player-names-fro.patch0055-Basic-PlayerProfile-API.patch0060-ensureServerConversions-API.patch0061-Add-getI18NDisplayName-API.patch0105-ItemStack-getMaxItemUseDuration.patch0114-ItemStack-API-additions-for-quantity-flags-lore.patch
Spigot-Server-Patches
0002-Paper-config-files.patch0009-Timings-v2.patch0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch0021-Further-improve-server-tick-loop.patch0028-Lighting-Queue.patch0045-Ensure-commands-are-not-ran-async.patch0049-Expose-server-CommandMap.patch0055-Add-velocity-warnings.patch0057-Add-exception-reporting-event.patch0064-Default-loading-permissions.yml-before-plugins.patch0065-Allow-Reloading-of-Custom-Permissions.patch0066-Remove-Metadata-on-reload.patch0095-Configurable-Keep-Spawn-Loaded-range-per-world.patch0116-Fix-Chunk-Unload-Queue-Issues.patch0126-Delay-Chunk-Unloads-based-on-Player-Movement.patch0132-Add-setting-for-proxy-online-mode-status.patch0138-Auto-Save-Improvements.patch0146-Prevent-Auto-Save-if-Save-Queue-is-full.patch0147-Chunk-Save-Stats-Debug-Option.patch0152-Allow-Reloading-of-Command-Aliases.patch0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch0178-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch0183-Add-configuration-option-to-prevent-player-names-fro.patch0184-Use-TerminalConsoleAppender-for-console-improvements.patch0189-Add-UnknownCommandEvent.patch0190-Basic-PlayerProfile-API.patch0191-Shoulder-Entities-Release-API.patch0223-AsyncTabCompleteEvent.patch0249-getPlayerUniqueId-API.patch0254-Add-method-to-open-already-placed-sign.patch0261-Expand-World.spawnParticle-API-and-add-Builder.patch0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch0281-Expand-Explosions-API.patch0287-Implement-World.getEntity-UUID-API.patch0288-InventoryCloseEvent-Reason-API.patch0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch
work
@ -1,4 +1,4 @@
|
||||
From dfdc0fc72aa42183a2d88cec42f0f08bcb1d474c Mon Sep 17 00:00:00 2001
|
||||
From f8fa09d5b8cbff7c0ce49d3fab5352ecdecb6172 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 29 Feb 2016 18:48:17 -0600
|
||||
Subject: [PATCH] Timings v2
|
||||
@ -3004,7 +3004,7 @@ index 00000000..df592d85
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 0f42a66a..68b5e1c9 100644
|
||||
index ff7f436c..b56c09d3 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -525,7 +525,6 @@ public final class Bukkit {
|
||||
@ -3016,10 +3016,10 @@ index 0f42a66a..68b5e1c9 100644
|
||||
|
||||
/**
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 053a24dc..0d41f7db 100644
|
||||
index a766ee96..4ddb8b02 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1011,12 +1011,27 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1037,12 +1037,27 @@ public interface Server extends PluginMessageRecipient {
|
||||
// Spigot start
|
||||
public class Spigot
|
||||
{
|
||||
|
@ -1,14 +1,14 @@
|
||||
From ff3b42f8a992f43e1a65e70f750f489168d633bd Mon Sep 17 00:00:00 2001
|
||||
From 5afd01f2ac262d4c1074c7eacb0550eebb115731 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 29 Feb 2016 17:24:57 -0600
|
||||
Subject: [PATCH] Add getTPS method
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 68b5e1c9..f3252e20 100644
|
||||
index b56c09d3..477a5833 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1127,6 +1127,16 @@ public final class Bukkit {
|
||||
@@ -1153,6 +1153,16 @@ public final class Bukkit {
|
||||
return server.getEntity(uuid);
|
||||
}
|
||||
|
||||
@ -26,10 +26,10 @@ index 68b5e1c9..f3252e20 100644
|
||||
* Get the advancement specified by this key.
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 331bb061..eb98c600 100644
|
||||
index 4ddb8b02..1fa6f53e 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -921,6 +921,15 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -947,6 +947,15 @@ public interface Server extends PluginMessageRecipient {
|
||||
*/
|
||||
Entity getEntity(UUID uuid);
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
From ab362d03af4b94722a764c5c06fe197fbda4d2d3 Mon Sep 17 00:00:00 2001
|
||||
From a16608e4c4b20cad5477b8be0c935581a1d0895f Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Mon, 29 Feb 2016 19:48:59 -0600
|
||||
Subject: [PATCH] Expose server CommandMap
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index f3252e20..a291ebd6 100644
|
||||
index 477a5833..73c85063 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
|
||||
@ -20,7 +20,7 @@ index f3252e20..a291ebd6 100644
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.inventory.InventoryType;
|
||||
@@ -1237,6 +1234,17 @@ public final class Bukkit {
|
||||
@@ -1263,6 +1260,17 @@ public final class Bukkit {
|
||||
return server.getUnsafe();
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ index f3252e20..a291ebd6 100644
|
||||
{
|
||||
return server.spigot();
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index e6a5cd2a..901199e3 100644
|
||||
index 1fa6f53e..70e19580 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
|
||||
@ -54,7 +54,7 @@ index e6a5cd2a..901199e3 100644
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.inventory.InventoryType;
|
||||
@@ -930,6 +927,14 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -956,6 +953,14 @@ public interface Server extends PluginMessageRecipient {
|
||||
public double[] getTPS();
|
||||
// Paper end
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 665f0cb22362dab461d1939b4aabbcf6a553907f Mon Sep 17 00:00:00 2001
|
||||
From 4df7359ab8d56f067a1373cd77a35c2ea2ed28d9 Mon Sep 17 00:00:00 2001
|
||||
From: William <admin@domnian.com>
|
||||
Date: Fri, 18 Mar 2016 03:28:07 -0400
|
||||
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
|
||||
@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 0844862c..bce4ba1b 100644
|
||||
index 471ae811..d6686820 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1263,6 +1263,13 @@ public final class Bukkit {
|
||||
@@ -1289,6 +1289,13 @@ public final class Bukkit {
|
||||
public static CommandMap getCommandMap() {
|
||||
return server.getCommandMap();
|
||||
}
|
||||
@ -24,10 +24,10 @@ index 0844862c..bce4ba1b 100644
|
||||
|
||||
public static Server.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 1ad2cba4..b6a2141c 100644
|
||||
index 56b0fdb5..5a4528c4 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1094,4 +1094,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1120,4 +1120,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
|
||||
Spigot spigot();
|
||||
// Spigot end
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 03ea3274fc02f71bb86eed95ab422f493a544873 Mon Sep 17 00:00:00 2001
|
||||
From 2eaf589a9abaea57928f1d5ceecb1e404999a090 Mon Sep 17 00:00:00 2001
|
||||
From: willies952002 <admin@domnian.com>
|
||||
Date: Mon, 28 Nov 2016 10:16:39 -0500
|
||||
Subject: [PATCH] Allow Reloading of Command Aliases
|
||||
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
|
||||
Reload the aliases stored in commands.yml
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index bce4ba1b..70495c15 100644
|
||||
index d6686820..35e18341 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1270,6 +1270,15 @@ public final class Bukkit {
|
||||
@@ -1296,6 +1296,15 @@ public final class Bukkit {
|
||||
public static void reloadPermissions() {
|
||||
server.reloadPermissions();
|
||||
}
|
||||
@ -26,10 +26,10 @@ index bce4ba1b..70495c15 100644
|
||||
|
||||
public static Server.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index b6a2141c..94d709f4 100644
|
||||
index 5a4528c4..12efd654 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1096,4 +1096,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1122,4 +1122,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
// Spigot end
|
||||
|
||||
void reloadPermissions(); // Paper
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6f46820d7b4ee0f41a22f79597a5371439d6521d Mon Sep 17 00:00:00 2001
|
||||
From 2ac7131971cf62c416974a622be676b1e55ff205 Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Fri, 9 Jun 2017 07:24:24 -0700
|
||||
Subject: [PATCH] Add configuration option to prevent player names from being
|
||||
@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 70495c15..c918d67c 100644
|
||||
index 35e18341..9558645f 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1279,6 +1279,16 @@ public final class Bukkit {
|
||||
@@ -1305,6 +1305,16 @@ public final class Bukkit {
|
||||
public static boolean reloadCommandAliases() {
|
||||
return server.reloadCommandAliases();
|
||||
}
|
||||
@ -27,10 +27,10 @@ index 70495c15..c918d67c 100644
|
||||
|
||||
public static Server.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 94d709f4..96044f4b 100644
|
||||
index 12efd654..da0d08b3 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1098,4 +1098,14 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1124,4 +1124,14 @@ public interface Server extends PluginMessageRecipient {
|
||||
void reloadPermissions(); // Paper
|
||||
|
||||
boolean reloadCommandAliases(); // Paper
|
||||
|
@ -1,4 +1,4 @@
|
||||
From e2c8fd3966e4d7bbf8825d9b7e22b527d2304811 Mon Sep 17 00:00:00 2001
|
||||
From 97a6a2c62004126fa289c26630892ada77e67845 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 15 Jan 2018 21:46:46 -0500
|
||||
Subject: [PATCH] Basic PlayerProfile API
|
||||
@ -239,7 +239,7 @@ index 00000000..d17061e6
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index c918d67c..01a226d9 100644
|
||||
index 9558645f..86e72f95 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -46,6 +46,9 @@ import org.bukkit.generator.ChunkGenerator;
|
||||
@ -252,7 +252,7 @@ index c918d67c..01a226d9 100644
|
||||
/**
|
||||
* Represents the Bukkit core, for version and Server singleton handling
|
||||
*/
|
||||
@@ -1289,6 +1292,37 @@ public final class Bukkit {
|
||||
@@ -1315,6 +1318,37 @@ public final class Bukkit {
|
||||
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
|
||||
return server.suggestPlayerNamesWhenNullTabCompletions();
|
||||
}
|
||||
@ -291,7 +291,7 @@ index c918d67c..01a226d9 100644
|
||||
|
||||
public static Server.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 96044f4b..6c96fc14 100644
|
||||
index da0d08b3..878255a4 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -47,6 +47,9 @@ import org.bukkit.generator.ChunkGenerator;
|
||||
@ -304,7 +304,7 @@ index 96044f4b..6c96fc14 100644
|
||||
/**
|
||||
* Represents a server implementation.
|
||||
*/
|
||||
@@ -1107,5 +1110,30 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1133,5 +1136,30 @@ public interface Server extends PluginMessageRecipient {
|
||||
* @return true if player names should be suggested
|
||||
*/
|
||||
boolean suggestPlayerNamesWhenNullTabCompletions();
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 913761361c5a2b8da0f5eaa0ddfd7b6a18cc9ecc Mon Sep 17 00:00:00 2001
|
||||
From 7a4550bdfee62eaba02e50fe3434310cb0b82f8c Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 4 May 2016 23:55:48 -0400
|
||||
Subject: [PATCH] ensureServerConversions API
|
||||
@ -28,10 +28,10 @@ index 762c43d6..045c26d9 100644
|
||||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index 41a43053..24a45189 100644
|
||||
index 3c91cbe6..4940e726 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -488,7 +488,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -495,7 +495,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
}
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@ index 41a43053..24a45189 100644
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -546,4 +551,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -553,4 +558,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3f49c33bedc491bb19580f5713bf536f366b931a Mon Sep 17 00:00:00 2001
|
||||
From 75065c61ba95680cd9e1db23b402a094d141b616 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 4 May 2016 23:55:48 -0400
|
||||
Subject: [PATCH] Add getI18NDisplayName API
|
||||
@ -28,10 +28,10 @@ index 045c26d9..47bbc0f9 100644
|
||||
// Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index 24a45189..b1d0778f 100644
|
||||
index 4940e726..e52a39ec 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -564,5 +564,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -571,5 +571,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
public ItemStack ensureServerConversions() {
|
||||
return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 02c74afa96de75233566264502c5989c25f93eef Mon Sep 17 00:00:00 2001
|
||||
From 68e948eef9e90c001f168f58660c61ca3bbee305 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 5 Jun 2018 22:59:50 -0400
|
||||
Subject: [PATCH] ItemStack#getMaxItemUseDuration
|
||||
@ -6,10 +6,10 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
|
||||
Allows you to determine how long it takes to use a usable/consumable item
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index b1d0778f..4385ca79 100644
|
||||
index e52a39ec..84a399e0 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -575,5 +575,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -582,5 +582,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
public String getI18NDisplayName() {
|
||||
return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
|
||||
}
|
||||
|
@ -1,11 +1,11 @@
|
||||
From ba60c4fe16615ca60be690c7bf4bb2bf30fd175f Mon Sep 17 00:00:00 2001
|
||||
From 356af878d4effe5adb4fbdc3bfc21128a693a7b0 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 22 Jun 2018 22:59:18 -0400
|
||||
Subject: [PATCH] ItemStack API additions for quantity/flags/lore
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index 4385ca79..7eb00104 100644
|
||||
index 84a399e0..4a27f4fc 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -2,7 +2,9 @@ package org.bukkit.inventory;
|
||||
@ -27,7 +27,7 @@ index 4385ca79..7eb00104 100644
|
||||
/**
|
||||
* Represents a stack of items
|
||||
*/
|
||||
@@ -583,5 +587,133 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -590,5 +594,133 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
// Requires access to NMS
|
||||
return ensureServerConversions().getMaxItemUseDuration();
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ea7585a551532e04ec7b38c220a373a9130dc062 Mon Sep 17 00:00:00 2001
|
||||
From 5d8ba7cb9d240fe918b9097ad5c35603af20b45b Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Mon, 29 Feb 2016 21:02:09 -0600
|
||||
Subject: [PATCH] Paper config files
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
||||
new file mode 100644
|
||||
index 000000000..e8f7b7292
|
||||
index 0000000000..e8f7b7292d
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
||||
@@ -0,0 +1,237 @@
|
||||
@ -249,7 +249,7 @@ index 000000000..e8f7b7292
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
new file mode 100644
|
||||
index 000000000..d5c6c37fa
|
||||
index 0000000000..d5c6c37fab
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -0,0 +1,177 @@
|
||||
@ -432,7 +432,7 @@ index 000000000..d5c6c37fa
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
new file mode 100644
|
||||
index 000000000..b8a6161d8
|
||||
index 0000000000..b8a6161d84
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -0,0 +1,67 @@
|
||||
@ -504,7 +504,7 @@ index 000000000..b8a6161d8
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index 5ff1e9686..3706e44a3 100644
|
||||
index 5ff1e96861..3706e44a34 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -192,6 +192,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
@ -519,7 +519,7 @@ index 5ff1e9686..3706e44a3 100644
|
||||
DedicatedServer.LOGGER.info("Generating keypair");
|
||||
this.a(MinecraftEncryption.b());
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 47fd48399..29c7043c8 100644
|
||||
index 47fd48399f..29c7043c86 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -134,9 +134,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
|
||||
@ -536,7 +536,7 @@ index 47fd48399..29c7043c8 100644
|
||||
public boolean impulse;
|
||||
public int portalCooldown;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
index ad3f89199..ca2a14d7a 100644
|
||||
index ad3f891999..ca2a14d7ac 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
@@ -2,6 +2,8 @@ package net.minecraft.server;
|
||||
@ -560,7 +560,7 @@ index ad3f89199..ca2a14d7a 100644
|
||||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 13c404337..b2bb06c79 100644
|
||||
index 13c4043377..b2bb06c796 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -127,6 +127,8 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
||||
@ -581,10 +581,10 @@ index 13c404337..b2bb06c79 100644
|
||||
this.world = new CraftWorld((WorldServer) this, gen, env);
|
||||
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 4dc0c8fcb..99d397872 100644
|
||||
index 1232ea4b2e..feab96c84c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -743,6 +743,7 @@ public final class CraftServer implements Server {
|
||||
@@ -744,6 +744,7 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
|
||||
@ -592,7 +592,7 @@ index 4dc0c8fcb..99d397872 100644
|
||||
for (WorldServer world : console.worlds) {
|
||||
world.worldData.setDifficulty(difficulty);
|
||||
world.setSpawnFlags(monsters, animals);
|
||||
@@ -758,6 +759,7 @@ public final class CraftServer implements Server {
|
||||
@@ -759,6 +760,7 @@ public final class CraftServer implements Server {
|
||||
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
|
||||
}
|
||||
world.spigotConfig.init(); // Spigot
|
||||
@ -600,7 +600,7 @@ index 4dc0c8fcb..99d397872 100644
|
||||
}
|
||||
|
||||
pluginManager.clearPlugins();
|
||||
@@ -765,6 +767,7 @@ public final class CraftServer implements Server {
|
||||
@@ -766,6 +768,7 @@ public final class CraftServer implements Server {
|
||||
resetRecipes();
|
||||
reloadData();
|
||||
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
|
||||
@ -608,7 +608,7 @@ index 4dc0c8fcb..99d397872 100644
|
||||
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
|
||||
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
|
||||
|
||||
@@ -1862,4 +1865,26 @@ public final class CraftServer implements Server {
|
||||
@@ -1864,4 +1867,26 @@ public final class CraftServer implements Server {
|
||||
{
|
||||
return spigot;
|
||||
}
|
||||
@ -636,7 +636,7 @@ index 4dc0c8fcb..99d397872 100644
|
||||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index df07dc594..57da619d8 100644
|
||||
index df07dc5946..57da619d80 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -128,6 +128,14 @@ public class Main {
|
||||
@ -655,7 +655,7 @@ index df07dc594..57da619d8 100644
|
||||
};
|
||||
|
||||
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
index 9128f7754..7b1a9a8a0 100644
|
||||
index 9128f77543..7b1a9a8a0e 100644
|
||||
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
@@ -39,31 +39,31 @@ public class SpigotWorldConfig
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 43fde1b1776449b70599136969eca45343f953a4 Mon Sep 17 00:00:00 2001
|
||||
From d84504147fb808dbe850614b40541d1f8b4dafb5 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 3 Mar 2016 04:00:11 -0600
|
||||
Subject: [PATCH] Timings v2
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
|
||||
|
||||
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
new file mode 100644
|
||||
index 000000000..4f624e39c
|
||||
index 0000000000..4f624e39c7
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
@@ -0,0 +1,125 @@
|
||||
@ -137,7 +137,7 @@ index 000000000..4f624e39c
|
||||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
|
||||
new file mode 100644
|
||||
index 000000000..0bb63600f
|
||||
index 0000000000..0bb63600f3
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
|
||||
@@ -0,0 +1,180 @@
|
||||
@ -323,7 +323,7 @@ index 000000000..0bb63600f
|
||||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
new file mode 100644
|
||||
index 000000000..145cb274b
|
||||
index 0000000000..145cb274b0
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
@@ -0,0 +1,104 @@
|
||||
@ -432,7 +432,7 @@ index 000000000..145cb274b
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index b89ec4252..e4ed7d674 100644
|
||||
index b89ec42525..e4ed7d674e 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
|
||||
@ -476,7 +476,7 @@ index b89ec4252..e4ed7d674 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
||||
index 06f10e1e8..43feccef8 100644
|
||||
index 06f10e1e84..43feccef8f 100644
|
||||
--- a/src/main/java/net/minecraft/server/Block.java
|
||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||
@@ -28,8 +28,16 @@ public class Block implements IMaterial {
|
||||
@ -499,7 +499,7 @@ index 06f10e1e8..43feccef8 100644
|
||||
Object2ByteLinkedOpenHashMap object2bytelinkedopenhashmap = new Object2ByteLinkedOpenHashMap(200) {
|
||||
protected void rehash(int i) {}
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
index 5164e5c92..0c2386f5e 100644
|
||||
index 5164e5c928..0c2386f5ec 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
@@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
|
||||
@ -530,7 +530,7 @@ index 5164e5c92..0c2386f5e 100644
|
||||
|
||||
return chunk1;
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 0296d3ef0..d23f4e80c 100644
|
||||
index 00cd8d8cea..aabdc9e2f0 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -122,14 +122,13 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@ -550,7 +550,7 @@ index 0296d3ef0..d23f4e80c 100644
|
||||
}
|
||||
}
|
||||
|
||||
@@ -221,7 +220,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -232,7 +231,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
}
|
||||
|
||||
public void saveChunk(IChunkAccess ichunkaccess, boolean unloaded) { // Spigot
|
||||
@ -560,7 +560,7 @@ index 0296d3ef0..d23f4e80c 100644
|
||||
this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
|
||||
} catch (IOException ioexception) {
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
index 88301ee61..5001fd11d 100644
|
||||
index 88301ee61e..5001fd11dc 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -607,7 +607,7 @@ index 88301ee61..5001fd11d 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index 3706e44a3..bf1fffcfe 100644
|
||||
index 3706e44a34..bf1fffcfee 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
|
||||
@ -660,7 +660,7 @@ index 3706e44a3..bf1fffcfe 100644
|
||||
return waitable.get();
|
||||
} catch (java.util.concurrent.ExecutionException e) {
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index e67c5dc90..f1e71de42 100644
|
||||
index e67c5dc90b..f1e71de42a 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
|
||||
@ -699,7 +699,7 @@ index e67c5dc90..f1e71de42 100644
|
||||
|
||||
protected float ab() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 514c95151..d6e9915c1 100644
|
||||
index 514c951516..d6e9915c1f 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
|
||||
@ -775,7 +775,7 @@ index 514c95151..d6e9915c1 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
|
||||
index ae31935c4..70c9b1f50 100644
|
||||
index ae31935c48..70c9b1f50c 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTracker.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
|
||||
@@ -168,7 +168,7 @@ public class EntityTracker {
|
||||
@ -806,7 +806,7 @@ index ae31935c4..70c9b1f50 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 71ee66a9b..1839bf7d2 100644
|
||||
index 71ee66a9bb..1839bf7d24 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -960,7 +960,7 @@ index 71ee66a9b..1839bf7d2 100644
|
||||
this.methodProfiler.e();
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
index ac6d8cc6e..d975c2ccf 100644
|
||||
index ac6d8cc6e6..d975c2ccf1 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1054,7 +1054,7 @@ index ac6d8cc6e..d975c2ccf 100644
|
||||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 42e0630e6..5d42cfe81 100644
|
||||
index 42e0630e60..5d42cfe81c 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
|
||||
@ -1093,7 +1093,7 @@ index 42e0630e6..5d42cfe81 100644
|
||||
// this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
|
||||
// CraftBukkit end
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
index 889b32287..69da194f5 100644
|
||||
index 889b32287e..69da194f52 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
@@ -1,11 +1,17 @@
|
||||
@ -1116,7 +1116,7 @@ index 889b32287..69da194f5 100644
|
||||
throw CancelledPacketHandleException.INSTANCE;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index e476d3433..9cef6b9af 100644
|
||||
index e476d3433b..9cef6b9af6 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1140,7 +1140,7 @@ index e476d3433..9cef6b9af 100644
|
||||
|
||||
public WhiteList getWhitelist() {
|
||||
diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
|
||||
index a07895935..ee5c2421b 100644
|
||||
index a07895935e..ee5c2421bb 100644
|
||||
--- a/src/main/java/net/minecraft/server/TickListServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/TickListServer.java
|
||||
@@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
|
||||
@ -1194,7 +1194,7 @@ index a07895935..ee5c2421b 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
||||
index cffbcb8f7..6b8a1c8c8 100644
|
||||
index cffbcb8f71..6b8a1c8c8b 100644
|
||||
--- a/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;
|
||||
@ -1214,7 +1214,7 @@ index cffbcb8f7..6b8a1c8c8 100644
|
||||
private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
|
||||
protected World world;
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index b2bb06c79..562a85b72 100644
|
||||
index b2bb06c796..562a85b726 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1329,7 +1329,7 @@ index b2bb06c79..562a85b72 100644
|
||||
|
||||
public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 2c6f6de4c..f032ecab6 100644
|
||||
index 2c6f6de4ce..f032ecab64 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1445,10 +1445,10 @@ index 2c6f6de4c..f032ecab6 100644
|
||||
|
||||
// CraftBukkit start
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 99d397872..bc1f858af 100644
|
||||
index feab96c84c..737ad3e1c0 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1835,12 +1835,31 @@ public final class CraftServer implements Server {
|
||||
@@ -1837,12 +1837,31 @@ public final class CraftServer implements Server {
|
||||
private final Spigot spigot = new Spigot()
|
||||
{
|
||||
|
||||
@ -1482,7 +1482,7 @@ index 99d397872..bc1f858af 100644
|
||||
org.spigotmc.RestartCommand.restart();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
||||
deleted file mode 100644
|
||||
index 4c8ab2bc9..000000000
|
||||
index 4c8ab2bc97..0000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
||||
+++ /dev/null
|
||||
@@ -1,174 +0,0 @@
|
||||
@ -1661,7 +1661,7 @@ index 4c8ab2bc9..000000000
|
||||
- }
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
index 413dd35f0..52a8c48fa 100644
|
||||
index 413dd35f06..52a8c48fa4 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
@@ -1,6 +1,8 @@
|
||||
@ -1697,7 +1697,7 @@ index 413dd35f0..52a8c48fa 100644
|
||||
|
||||
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 75d56ee3b..47f650e42 100644
|
||||
index 75d56ee3bd..47f650e426 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1665,6 +1665,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@ -1714,7 +1714,7 @@ index 75d56ee3b..47f650e42 100644
|
||||
|
||||
public Player.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
index f11bd7545..93b9134d6 100644
|
||||
index f11bd7545f..93b9134d6e 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
@@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
@ -1790,7 +1790,7 @@ index f11bd7545..93b9134d6 100644
|
||||
|
||||
private boolean isReady(final int currentTick) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
index 7e7ce9a81..46029ce24 100644
|
||||
index 7e7ce9a81b..46029ce246 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
@@ -1,8 +1,8 @@
|
||||
@ -1872,7 +1872,7 @@ index 7e7ce9a81..46029ce24 100644
|
||||
- // Spigot end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
|
||||
index e52ef47b7..3d90b3426 100644
|
||||
index e52ef47b78..3d90b34268 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
|
||||
@@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
|
||||
@ -1884,7 +1884,7 @@ index e52ef47b7..3d90b3426 100644
|
||||
this.value = value;
|
||||
}
|
||||
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
index e60fe5a92..f68e42c4d 100644
|
||||
index e60fe5a920..f68e42c4d4 100644
|
||||
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
||||
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
@@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ececfb43f16b065d3755a1bfc4e889287c0e3c95 Mon Sep 17 00:00:00 2001
|
||||
From 7cd9445ab28c3f5c5ce2ca674af31de0a2d1faa1 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 14:32:43 -0600
|
||||
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
|
||||
index 220ca7bca..eb4b08be4 100644
|
||||
index 220ca7bca0..eb4b08be46 100644
|
||||
--- a/src/main/java/net/minecraft/server/EULA.java
|
||||
+++ b/src/main/java/net/minecraft/server/EULA.java
|
||||
@@ -52,13 +52,12 @@ public class EULA {
|
||||
@ -25,7 +25,7 @@ index 220ca7bca..eb4b08be4 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 1839bf7d2..5d5aa72ca 100644
|
||||
index 1839bf7d24..5d5aa72ca2 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1205,7 +1205,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
||||
@ -38,10 +38,10 @@ index 1839bf7d2..5d5aa72ca 100644
|
||||
|
||||
public CrashReport b(CrashReport crashreport) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index bc1f858af..ce87736da 100644
|
||||
index 737ad3e1c0..0dda989453 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -152,7 +152,7 @@ import org.bukkit.event.server.TabCompleteEvent;
|
||||
@@ -153,7 +153,7 @@ import org.bukkit.event.server.TabCompleteEvent;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
|
||||
public final class CraftServer implements Server {
|
||||
@ -51,7 +51,7 @@ index bc1f858af..ce87736da 100644
|
||||
private final String bukkitVersion = Versioning.getBukkitVersion();
|
||||
private final Logger logger = Logger.getLogger("Minecraft");
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 57da619d8..38e696aa9 100644
|
||||
index 57da619d80..38e696aa94 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -200,7 +200,7 @@ public class Main {
|
||||
@ -64,7 +64,7 @@ index 57da619d8..38e696aa9 100644
|
||||
Thread.sleep(TimeUnit.SECONDS.toMillis(15));
|
||||
}
|
||||
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
index 94a3d4237..91b8aa6a1 100644
|
||||
index 94a3d4237d..91b8aa6a16 100644
|
||||
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 977746b6c79dbf14c44ccb350fef1a1ab88084b7 Mon Sep 17 00:00:00 2001
|
||||
From 9bf320c306882fff5aaff5e9ede004e6674fe198 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 1 Mar 2016 23:09:29 -0600
|
||||
Subject: [PATCH] Further improve server tick loop
|
||||
@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
|
||||
Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 5d5aa72ca..ae17796ce 100644
|
||||
index 5d5aa72ca2..ae17796ce2 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -142,7 +142,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
||||
@ -149,10 +149,10 @@ index 5d5aa72ca..ae17796ce 100644
|
||||
}
|
||||
lastTick = curTime;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index ce87736da..fdcdbf508 100644
|
||||
index 0dda989453..6ad91a16f2 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1832,6 +1832,17 @@ public final class CraftServer implements Server {
|
||||
@@ -1834,6 +1834,17 @@ public final class CraftServer implements Server {
|
||||
return CraftMagicNumbers.INSTANCE;
|
||||
}
|
||||
|
||||
@ -171,7 +171,7 @@ index ce87736da..fdcdbf508 100644
|
||||
{
|
||||
|
||||
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
|
||||
index be2e31dea..6d21c3269 100644
|
||||
index be2e31deae..6d21c32692 100644
|
||||
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
|
||||
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
|
||||
@@ -1,8 +1,5 @@
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 8dca59c82d4970ec06b04d9656b4b2d6cb1b841d Mon Sep 17 00:00:00 2001
|
||||
From 86c2617665e69182c21d9c57a6827cec49848fa8 Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Wed, 2 Mar 2016 00:52:31 -0600
|
||||
Subject: [PATCH] Lighting Queue
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Lighting Queue
|
||||
This provides option to queue lighting updates to ensure they do not cause the server lag
|
||||
|
||||
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
index 145cb274b..eff9dcf54 100644
|
||||
index 145cb274b0..eff9dcf54f 100644
|
||||
--- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
@@ -50,6 +50,8 @@ public class WorldTimingsHandler {
|
||||
@ -28,7 +28,7 @@ index 145cb274b..eff9dcf54 100644
|
||||
|
||||
public static Timing getTickList(WorldServer worldserver, String timingsType) {
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 68898d624..4b36a0f05 100644
|
||||
index 68898d624f..4b36a0f053 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -130,4 +130,10 @@ public class PaperWorldConfig {
|
||||
@ -43,7 +43,7 @@ index 68898d624..4b36a0f05 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index adf3dee2e..eb7a41977 100644
|
||||
index adf3dee2ef..eb7a41977f 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -91,6 +91,7 @@ public class Chunk implements IChunkAccess {
|
||||
@ -102,10 +102,10 @@ index adf3dee2e..eb7a41977 100644
|
||||
|
||||
IMMEDIATE, QUEUED, CHECK;
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index d23f4e80c..48b484da1 100644
|
||||
index aabdc9e2f0..d025d949e3 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -322,6 +322,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -333,6 +333,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
return false;
|
||||
}
|
||||
save = event.isSaveChunk();
|
||||
@ -114,7 +114,7 @@ index d23f4e80c..48b484da1 100644
|
||||
// Update neighbor counts
|
||||
for (int x = -2; x < 3; x++) {
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index ae17796ce..1ac8d61cd 100644
|
||||
index ae17796ce2..1ac8d61cd9 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -864,7 +864,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
||||
@ -136,7 +136,7 @@ index ae17796ce..1ac8d61cd 100644
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PaperLightingQueue.java b/src/main/java/net/minecraft/server/PaperLightingQueue.java
|
||||
new file mode 100644
|
||||
index 000000000..345cd5824
|
||||
index 0000000000..345cd58240
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/minecraft/server/PaperLightingQueue.java
|
||||
@@ -0,0 +1,92 @@
|
||||
@ -233,7 +233,7 @@ index 000000000..345cd5824
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index bfe09a205..c40ecbc0c 100644
|
||||
index bfe09a2055..c40ecbc0c3 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -325,7 +325,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d580113b141bff72bf56e052480927f606b34ae2 Mon Sep 17 00:00:00 2001
|
||||
From bd9a065c4b1cbe5ff5dc45da9193adc0e9328252 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 3 Mar 2016 01:17:12 -0600
|
||||
Subject: [PATCH] Ensure commands are not ran async
|
||||
@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
|
||||
that it is happening so that plugin authors can fix their code to stop executing commands async.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 359aa3997..88b761d27 100644
|
||||
index 5d42cfe81c..dc38e4e043 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1548,6 +1548,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||
@ -48,10 +48,10 @@ index 359aa3997..88b761d27 100644
|
||||
} else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
|
||||
// Do nothing, this is coming from a plugin
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 6e152fe17..d637199ca 100644
|
||||
index 6ad91a16f2..a270d31b22 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -689,6 +689,29 @@ public final class CraftServer implements Server {
|
||||
@@ -690,6 +690,29 @@ public final class CraftServer implements Server {
|
||||
Validate.notNull(commandLine, "CommandLine cannot be null");
|
||||
org.spigotmc.AsyncCatcher.catchOp( "command dispatch" ); // Spigot
|
||||
|
||||
@ -82,7 +82,7 @@ index 6e152fe17..d637199ca 100644
|
||||
return true;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
|
||||
index a0cdd2317..984df4083 100644
|
||||
index a0cdd2317c..984df4083d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
|
||||
@@ -14,6 +14,7 @@ public class ServerShutdownThread extends Thread {
|
||||
@ -94,7 +94,7 @@ index a0cdd2317..984df4083 100644
|
||||
} catch (ExceptionWorldConflict ex) {
|
||||
ex.printStackTrace();
|
||||
diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
|
||||
index 4b3aa85c9..e44c23016 100644
|
||||
index 4b3aa85c97..e44c230165 100644
|
||||
--- a/src/main/java/org/spigotmc/AsyncCatcher.java
|
||||
+++ b/src/main/java/org/spigotmc/AsyncCatcher.java
|
||||
@@ -6,6 +6,7 @@ public class AsyncCatcher
|
||||
@ -106,7 +106,7 @@ index 4b3aa85c9..e44c23016 100644
|
||||
public static void catchOp(String reason)
|
||||
{
|
||||
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
|
||||
index 49768734d..947c43a5d 100644
|
||||
index 49768734d0..947c43a5d0 100644
|
||||
--- a/src/main/java/org/spigotmc/RestartCommand.java
|
||||
+++ b/src/main/java/org/spigotmc/RestartCommand.java
|
||||
@@ -43,6 +43,7 @@ public class RestartCommand extends Command
|
||||
|
@ -1,14 +1,14 @@
|
||||
From bd50b8b817431b942df9ac1ed7cb17e6f9854b63 Mon Sep 17 00:00:00 2001
|
||||
From c66ee93656b5300113b076f9643a454227cf850a Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Thu, 3 Mar 2016 02:15:57 -0600
|
||||
Subject: [PATCH] Expose server CommandMap
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 2d8820070..6d00be24b 100644
|
||||
index a270d31b22..d7e77a849a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1586,6 +1586,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1588,6 +1588,7 @@ public final class CraftServer implements Server {
|
||||
return helpMap;
|
||||
}
|
||||
|
||||
|
@ -1,14 +1,14 @@
|
||||
From 76cf594d89a46249517f0ba6ce8fbc613fbf0cc8 Mon Sep 17 00:00:00 2001
|
||||
From 4409e5d855574376439fcdf9b600891e3bff726d Mon Sep 17 00:00:00 2001
|
||||
From: Joseph Hirschfeld <joe@ibj.io>
|
||||
Date: Thu, 3 Mar 2016 02:48:12 -0600
|
||||
Subject: [PATCH] Add velocity warnings
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 703d38f0c..a9d60b8d2 100644
|
||||
index d7e77a849a..e701b37cb4 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -189,6 +189,7 @@ public final class CraftServer implements Server {
|
||||
@@ -190,6 +190,7 @@ public final class CraftServer implements Server {
|
||||
public boolean ignoreVanillaPermissions = false;
|
||||
private final List<CraftPlayer> playerView;
|
||||
public int reloadCount;
|
||||
@ -17,7 +17,7 @@ index 703d38f0c..a9d60b8d2 100644
|
||||
private final class BooleanWrapper {
|
||||
private boolean value = true;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index 34246369c..03a3328b0 100644
|
||||
index 34246369c5..03a3328b06 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -262,12 +262,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
@ -66,7 +66,7 @@ index 34246369c..03a3328b0 100644
|
||||
public double getHeight() {
|
||||
return getHandle().length;
|
||||
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
index 91b8aa6a1..0c106ea9c 100644
|
||||
index 91b8aa6a16..0c106ea9c5 100644
|
||||
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
@@ -66,7 +66,19 @@ public class WatchdogThread extends Thread
|
||||
|
@ -1,4 +1,4 @@
|
||||
From bc419c45755963ad83e1443d17994292bfa81259 Mon Sep 17 00:00:00 2001
|
||||
From fb4b41fa026be788337abf1f961f30431821c147 Mon Sep 17 00:00:00 2001
|
||||
From: Joseph Hirschfeld <joe@ibj.io>
|
||||
Date: Thu, 3 Mar 2016 03:15:41 -0600
|
||||
Subject: [PATCH] Add exception reporting event
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
|
||||
new file mode 100644
|
||||
index 000000000..93397188b
|
||||
index 0000000000..93397188b7
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
|
||||
@@ -0,0 +1,38 @@
|
||||
@ -50,7 +50,7 @@ index 000000000..93397188b
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index 0d80d811a..e3f7ec610 100644
|
||||
index 0d80d811a3..e3f7ec6100 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -98,7 +98,7 @@ index 0d80d811a..e3f7ec610 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 48b484da1..6917fdbe0 100644
|
||||
index d025d949e3..0e04d65981 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -17,6 +17,7 @@ import java.util.concurrent.ExecutionException;
|
||||
@ -109,7 +109,7 @@ index 48b484da1..6917fdbe0 100644
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@@ -214,7 +215,11 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -225,7 +226,11 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
try {
|
||||
// this.chunkLoader.a(this.world, chunk); // Spigot
|
||||
} catch (Exception exception) {
|
||||
@ -122,7 +122,7 @@ index 48b484da1..6917fdbe0 100644
|
||||
}
|
||||
|
||||
}
|
||||
@@ -224,9 +229,14 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -235,9 +240,14 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
ichunkaccess.setLastSaved(this.world.getTime());
|
||||
this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
|
||||
} catch (IOException ioexception) {
|
||||
@ -140,7 +140,7 @@ index 48b484da1..6917fdbe0 100644
|
||||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
||||
index 33e5aaf2c..f13534917 100644
|
||||
index 33e5aaf2c0..f135349174 100644
|
||||
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
||||
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -167,7 +167,7 @@ index 33e5aaf2c..f13534917 100644
|
||||
}
|
||||
// CraftBukkit end
|
||||
diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java
|
||||
index 6b5600ba5..72f386720 100644
|
||||
index 6b5600ba5f..72f3867203 100644
|
||||
--- a/src/main/java/net/minecraft/server/PersistentCollection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PersistentCollection.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -194,7 +194,7 @@ index 6b5600ba5..72f386720 100644
|
||||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
|
||||
index 31899549d..cc7cad8be 100644
|
||||
index 31899549d5..cc7cad8be4 100644
|
||||
--- a/src/main/java/net/minecraft/server/RegionFile.java
|
||||
+++ b/src/main/java/net/minecraft/server/RegionFile.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -221,7 +221,7 @@ index 31899549d..cc7cad8be 100644
|
||||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
|
||||
index 0e91aeec3..ff473a263 100644
|
||||
index 0e91aeec38..ff473a263f 100644
|
||||
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
|
||||
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -240,7 +240,7 @@ index 0e91aeec3..ff473a263 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||
index b12e767db..342a15db5 100644
|
||||
index b12e767db9..342a15db5e 100644
|
||||
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||
@@ -10,6 +10,7 @@ import org.apache.logging.log4j.LogManager;
|
||||
@ -268,7 +268,7 @@ index b12e767db..342a15db5 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
|
||||
index 4ff243dab..67b2e41c7 100644
|
||||
index 4ff243dabe..67b2e41c7c 100644
|
||||
--- a/src/main/java/net/minecraft/server/VillageSiege.java
|
||||
+++ b/src/main/java/net/minecraft/server/VillageSiege.java
|
||||
@@ -1,5 +1,7 @@
|
||||
@ -288,7 +288,7 @@ index 4ff243dab..67b2e41c7 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 30cafca04..fa75ed496 100644
|
||||
index 30cafca041..fa75ed4963 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1,6 +1,8 @@
|
||||
@ -325,7 +325,7 @@ index 30cafca04..fa75ed496 100644
|
||||
this.tileEntityListTick.remove(tileTickPosition--);
|
||||
continue;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
index 93b9134d6..26753fac5 100644
|
||||
index 93b9134d6e..26753fac5e 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
@@ -15,6 +15,9 @@ import java.util.concurrent.atomic.AtomicReference;
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 457a6a9134923a2de82ec70c97818156be6d88b0 Mon Sep 17 00:00:00 2001
|
||||
From e9ee81ba8c88cb42333db3f2dcd73378dd8222b3 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 18 Mar 2016 13:17:38 -0400
|
||||
Subject: [PATCH] Default loading permissions.yml before plugins
|
||||
@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
|
||||
A config option has been added for those who depend on the previous behavior, but I don't expect that.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 280cfd553..40c5ea474 100644
|
||||
index 280cfd5534..40c5ea4745 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -214,4 +214,9 @@ public class PaperConfig {
|
||||
@ -30,10 +30,10 @@ index 280cfd553..40c5ea474 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 899002f27..ff966de55 100644
|
||||
index e701b37cb4..030d68a704 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -330,6 +330,7 @@ public final class CraftServer implements Server {
|
||||
@@ -331,6 +331,7 @@ public final class CraftServer implements Server {
|
||||
if (type == PluginLoadOrder.STARTUP) {
|
||||
helpMap.clear();
|
||||
helpMap.initializeGeneralTopics();
|
||||
@ -41,7 +41,7 @@ index 899002f27..ff966de55 100644
|
||||
}
|
||||
|
||||
Plugin[] plugins = pluginManager.getPlugins();
|
||||
@@ -347,7 +348,7 @@ public final class CraftServer implements Server {
|
||||
@@ -348,7 +349,7 @@ public final class CraftServer implements Server {
|
||||
setVanillaCommands(false);
|
||||
// Spigot end
|
||||
commandMap.registerServerAliases();
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 03aaffbcad2bfeb80e38be011d9da2f2934c57e8 Mon Sep 17 00:00:00 2001
|
||||
From 184517875c3d769ae9242daf249ac905affd1a36 Mon Sep 17 00:00:00 2001
|
||||
From: William <admin@domnian.com>
|
||||
Date: Fri, 18 Mar 2016 03:30:17 -0400
|
||||
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
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index ff966de55..3f51eb384 100644
|
||||
index 030d68a704..83364efb50 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1942,5 +1942,20 @@ public final class CraftServer implements Server {
|
||||
@@ -1944,5 +1944,20 @@ public final class CraftServer implements Server {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 9143857ff7220c7c81e4ed9aa68f1a077b053001 Mon Sep 17 00:00:00 2001
|
||||
From 6a88f48f2414502aeda9ce864b9bf41a86541d13 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 18 Mar 2016 13:50:14 -0400
|
||||
Subject: [PATCH] Remove Metadata on reload
|
||||
@ -7,10 +7,10 @@ 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.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 1c9637ff7..f90dc11f2 100644
|
||||
index 83364efb50..f3af4ba520 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -787,8 +787,18 @@ public final class CraftServer implements Server {
|
||||
@@ -788,8 +788,18 @@ public final class CraftServer implements Server {
|
||||
world.paperConfig.init(); // Paper
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 90bc150bac4110f2a0cd4144e46d5e33171c8f21 Mon Sep 17 00:00:00 2001
|
||||
From 326ebf870067e1631b73dc368ab9794d1e0dd0f0 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 13 Sep 2014 23:14:43 -0400
|
||||
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
|
||||
This lets you disable it for some worlds and lower it for others.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index bb1c1c57c..667a0dde8 100644
|
||||
index bb1c1c57cc..667a0dde8c 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -233,4 +233,10 @@ public class PaperWorldConfig {
|
||||
@ -21,7 +21,7 @@ index bb1c1c57c..667a0dde8 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 96d31f874..071a1e30f 100644
|
||||
index 96d31f8749..071a1e30f7 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -485,13 +485,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
||||
@ -63,7 +63,7 @@ index 96d31f874..071a1e30f 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 6ec1ee26d..a4c8e62e2 100644
|
||||
index 6ec1ee26dc..a4c8e62e22 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -2825,8 +2825,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
||||
@ -78,10 +78,10 @@ index 6ec1ee26d..a4c8e62e2 100644
|
||||
|
||||
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
|
||||
index 62872675d..7cb795dd8 100644
|
||||
index f3af4ba520..761db58b29 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -990,7 +990,7 @@ public final class CraftServer implements Server {
|
||||
@@ -991,7 +991,7 @@ public final class CraftServer implements Server {
|
||||
System.out.println("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")");
|
||||
|
||||
if (internal.getWorld().getKeepSpawnInMemory()) {
|
||||
@ -91,10 +91,10 @@ index 62872675d..7cb795dd8 100644
|
||||
for (int j = -short1; j <= short1; j += 16) {
|
||||
for (int k = -short1; k <= short1; k += 16) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index 0b2a9d09d..ff3558363 100644
|
||||
index 29a5ac639e..e3e45ed48a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -1285,8 +1285,9 @@ public class CraftWorld implements World {
|
||||
@@ -1281,8 +1281,9 @@ public class CraftWorld implements World {
|
||||
int chunkCoordX = chunkcoordinates.getX() >> 4;
|
||||
int chunkCoordZ = chunkcoordinates.getZ() >> 4;
|
||||
// Cycle through the 25x25 Chunks around it to load/unload the chunks.
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 30ff596e33f0ee629ff67ef52d067a7957ef540d Mon Sep 17 00:00:00 2001
|
||||
From 5f487664b0a7c81473babc61ebcb4d2b577b2405 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 12 May 2016 02:03:56 -0400
|
||||
Subject: [PATCH] Fix Chunk Unload Queue Issues
|
||||
@ -22,10 +22,10 @@ index 695c6d3b70..acc21aec02 100644
|
||||
private int E;
|
||||
private final AtomicInteger F;
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 6917fdbe04..bac5c921b6 100644
|
||||
index 0e04d65981..2925c345a1 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -301,6 +301,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -312,6 +312,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
|
||||
if (chunk != null && chunk.d) {
|
||||
// CraftBukkit start - move unload logic to own method
|
||||
|
@ -1,4 +1,4 @@
|
||||
From b08649391177cc01b16d318a959465094d90a183 Mon Sep 17 00:00:00 2001
|
||||
From 6c65812f358717d4ce1529e6fde27cdabc07c072 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 18 Jun 2016 23:22:12 -0400
|
||||
Subject: [PATCH] Delay Chunk Unloads based on Player Movement
|
||||
@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s
|
||||
wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 41e73b340..ec6b550ff 100644
|
||||
index 41e73b3409..ec6b550ff6 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -285,4 +285,18 @@ public class PaperWorldConfig {
|
||||
@ -40,7 +40,7 @@ index 41e73b340..ec6b550ff 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index acc21aec0..c27073d27 100644
|
||||
index acc21aec02..c27073d27c 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -39,6 +39,7 @@ public class Chunk implements IChunkAccess {
|
||||
@ -52,10 +52,10 @@ index acc21aec0..c27073d27 100644
|
||||
public final int locZ;
|
||||
private boolean m;
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index bac5c921b..4f9ece9e4 100644
|
||||
index 2925c345a1..a5139b0b0d 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -317,6 +317,19 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -328,6 +328,19 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
|
||||
activityAccountant.endActivity(); // Spigot
|
||||
}
|
||||
@ -76,7 +76,7 @@ index bac5c921b..4f9ece9e4 100644
|
||||
this.f.a();
|
||||
this.chunkLoader.b();
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
index ffff87dc0..344b95233 100644
|
||||
index ffff87dc03..344b95233f 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
@@ -33,14 +33,23 @@ public class PlayerChunk {
|
||||
@ -112,7 +112,7 @@ index ffff87dc0..344b95233 100644
|
||||
|
||||
return this.chunk != null;
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
index 4d888d6d4..cf5c76a78 100644
|
||||
index 4d888d6d4f..cf5c76a78e 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
@@ -461,7 +461,13 @@ public class PlayerChunkMap {
|
||||
@ -131,7 +131,7 @@ index 4d888d6d4..cf5c76a78 100644
|
||||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index f1c036aa6..95ec4f48f 100644
|
||||
index f1c036aa6a..95ec4f48f2 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1294,7 +1294,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
||||
@ -150,10 +150,10 @@ index f1c036aa6..95ec4f48f 100644
|
||||
this.methodProfiler.a(() -> {
|
||||
return String.valueOf(TileEntityTypes.a(tileentity.C()));
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index ff3558363..90e260f3b 100644
|
||||
index e3e45ed48a..d4851dd2a6 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -1581,7 +1581,7 @@ public class CraftWorld implements World {
|
||||
@@ -1577,7 +1577,7 @@ public class CraftWorld implements World {
|
||||
ChunkProviderServer cps = world.getChunkProviderServer();
|
||||
for (net.minecraft.server.Chunk chunk : cps.chunks.values()) {
|
||||
// If in use, skip it
|
||||
@ -163,7 +163,7 @@ index ff3558363..90e260f3b 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
index a9b84fdec..e02647f80 100644
|
||||
index a9b84fdec4..e02647f806 100644
|
||||
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
||||
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
@@ -284,6 +284,10 @@ public class ActivationRange
|
||||
|
@ -1,11 +1,11 @@
|
||||
From d6def09be9332d4ca4880e9c531e267a369b6516 Mon Sep 17 00:00:00 2001
|
||||
From b81234662dc8a123760b733872fc6341c1cdb723 Mon Sep 17 00:00:00 2001
|
||||
From: Gabriele C <sgdc3.mail@gmail.com>
|
||||
Date: Fri, 5 Aug 2016 01:03:08 +0200
|
||||
Subject: [PATCH] Add setting for proxy online mode status
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 5538dfd9d..0e5773bae 100644
|
||||
index 5538dfd9d8..0e5773bae4 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -234,4 +234,9 @@ public class PaperConfig {
|
||||
@ -19,7 +19,7 @@ index 5538dfd9d..0e5773bae 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
||||
index f13534917..85c7a96c5 100644
|
||||
index f135349174..85c7a96c5a 100644
|
||||
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
||||
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
||||
@@ -60,7 +60,8 @@ public class NameReferencingFileConverter {
|
||||
@ -33,10 +33,10 @@ index f13534917..85c7a96c5 100644
|
||||
} else {
|
||||
String[] astring1 = astring;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 7cb795dd8..e125632ff 100644
|
||||
index 761db58b29..3bbf9b0189 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1357,7 +1357,8 @@ public final class CraftServer implements Server {
|
||||
@@ -1358,7 +1358,8 @@ public final class CraftServer implements Server {
|
||||
// Spigot Start
|
||||
GameProfile profile = null;
|
||||
// Only fetch an online UUID in online mode
|
||||
|
@ -1,4 +1,4 @@
|
||||
From fe7cdbbd2c1695cd6b3237b9cd951b1cd24b99a6 Mon Sep 17 00:00:00 2001
|
||||
From cfaacd1e20ab7cd9ecb5cca91fe53e601d362c28 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 19 Sep 2016 23:16:39 -0400
|
||||
Subject: [PATCH] Auto Save Improvements
|
||||
@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
|
||||
Adds incremental player auto saving too
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 4bdb0a5f9..315d85090 100644
|
||||
index 4bdb0a5f9c..315d85090a 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -255,4 +255,15 @@ public class PaperConfig {
|
||||
@ -32,7 +32,7 @@ index 4bdb0a5f9..315d85090 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index ec6b550ff..499230af6 100644
|
||||
index ec6b550ff6..499230af60 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -2,6 +2,7 @@ package com.destroystokyo.paper;
|
||||
@ -64,7 +64,7 @@ index ec6b550ff..499230af6 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index c27073d27..06d6814b8 100644
|
||||
index c27073d27c..06d6814b83 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -52,9 +52,9 @@ public class Chunk implements IChunkAccess {
|
||||
@ -96,7 +96,7 @@ index c27073d27..06d6814b8 100644
|
||||
|
||||
public boolean isEmpty() {
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 4f9ece9e4..afeb0685b 100644
|
||||
index a5139b0b0d..aa8d25e765 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -106,7 +106,7 @@ index 4f9ece9e4..afeb0685b 100644
|
||||
import com.google.common.collect.Lists;
|
||||
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.longs.Long2ObjectMaps;
|
||||
@@ -259,7 +260,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -270,7 +271,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
this.saveChunk(chunk, false); // Spigot
|
||||
chunk.a(false);
|
||||
++i;
|
||||
@ -116,7 +116,7 @@ index 4f9ece9e4..afeb0685b 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index 982e18f8a..1879c3238 100644
|
||||
index 982e18f8af..1879c32381 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -38,6 +38,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
@ -128,7 +128,7 @@ index 982e18f8a..1879c3238 100644
|
||||
public final MinecraftServer server;
|
||||
public final PlayerInteractManager playerInteractManager;
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index d25e5c508..3447afcad 100644
|
||||
index d25e5c508a..3447afcad8 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -144,6 +144,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
||||
@ -175,7 +175,7 @@ index d25e5c508..3447afcad 100644
|
||||
this.methodProfiler.a("snooper");
|
||||
if (getSnooperEnabled() && !this.j.d() && this.ticks > 100) { // Spigot
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index d0c547cc9..12f6812d6 100644
|
||||
index d0c547cc99..12f6812d67 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -341,6 +341,7 @@ public abstract class PlayerList {
|
||||
@ -214,7 +214,7 @@ index d0c547cc9..12f6812d6 100644
|
||||
public WhiteList getWhitelist() {
|
||||
return this.whitelist;
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 96002184b..bf07155bc 100644
|
||||
index 96002184bb..bf07155bc1 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -872,8 +872,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 09a8983338740bfacd3ce69e393a7962c9cd62c7 Mon Sep 17 00:00:00 2001
|
||||
From a5933b1c3c740f9eb59ce6db6ea847ee2a588a26 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 3 Nov 2016 21:52:22 -0400
|
||||
Subject: [PATCH] Prevent Auto Save if Save Queue is full
|
||||
@ -7,7 +7,7 @@ If the save queue already has 50 (configurable) of chunks pending,
|
||||
then avoid processing auto save (which would add more)
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 189ec79f0..4d0f2051a 100644
|
||||
index 189ec79f05..4d0f2051aa 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -316,6 +316,11 @@ public class PaperWorldConfig {
|
||||
@ -23,10 +23,10 @@ index 189ec79f0..4d0f2051a 100644
|
||||
private void removeCorruptTEs() {
|
||||
removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index afeb0685b..a4c4a9486 100644
|
||||
index aa8d25e765..c1a42e61e7 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -249,6 +249,14 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -260,6 +260,14 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
ArrayList arraylist = Lists.newArrayList(this.chunks.values());
|
||||
Iterator iterator = arraylist.iterator();
|
||||
|
||||
@ -41,7 +41,7 @@ index afeb0685b..a4c4a9486 100644
|
||||
while (iterator.hasNext()) {
|
||||
Chunk chunk = (Chunk) iterator.next();
|
||||
|
||||
@@ -260,7 +268,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -271,7 +279,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
this.saveChunk(chunk, false); // Spigot
|
||||
chunk.a(false);
|
||||
++i;
|
||||
@ -51,7 +51,7 @@ index afeb0685b..a4c4a9486 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
index 2f1488ee5..859148cb8 100644
|
||||
index 2f1488ee53..859148cb86 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
@@ -137,6 +137,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3bfb26feb30df2fd52c8d8977140a3e4a5348349 Mon Sep 17 00:00:00 2001
|
||||
From 8281788d504c1618e1129a3dc19ce80b64d1c22c Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 4 Nov 2016 02:12:10 -0400
|
||||
Subject: [PATCH] Chunk Save Stats Debug Option
|
||||
@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
|
||||
Stats on current queue, how many was processed and how many were queued.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index a4c4a9486b..4be7173bf2 100644
|
||||
index c1a42e61e7..c96f1b2753 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -36,6 +36,11 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@ -23,7 +23,7 @@ index a4c4a9486b..4be7173bf2 100644
|
||||
public final WorldServer world;
|
||||
|
||||
public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator<?> chunkgenerator, IAsyncTaskHandler iasynctaskhandler) {
|
||||
@@ -252,6 +257,30 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -263,6 +268,30 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
// Paper start
|
||||
final ChunkRegionLoader chunkLoader = (ChunkRegionLoader) world.getChunkProviderServer().chunkLoader;
|
||||
final int queueSize = chunkLoader.getQueueSize();
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f1900c57c2495acc1a0747ef052e9123a535936e Mon Sep 17 00:00:00 2001
|
||||
From 977bbc79a58bf09d5ecd26dc52c2d6bd64d2949d Mon Sep 17 00:00:00 2001
|
||||
From: willies952002 <admin@domnian.com>
|
||||
Date: Mon, 28 Nov 2016 10:21:52 -0500
|
||||
Subject: [PATCH] Allow Reloading of Command Aliases
|
||||
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
|
||||
Reload the aliases stored in commands.yml
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index e125632ffe..d7247a1ec9 100644
|
||||
index 3bbf9b0189..35b26d6128 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1968,5 +1968,24 @@ public final class CraftServer implements Server {
|
||||
@@ -1970,5 +1970,24 @@ public final class CraftServer implements Server {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a2f619363cdd57c1db00dd504b5ed68e2218267d Mon Sep 17 00:00:00 2001
|
||||
From b3d7ede96e1be472691ae42cdcd99ffdf7e672d9 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 19 Dec 2017 16:31:46 -0500
|
||||
Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
|
||||
@ -221,10 +221,10 @@ index 998662d9e6..6b4eb7f053 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index 86848543d0..7004f11764 100644
|
||||
index 9cd991c3e7..b3756074b5 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -1220,7 +1220,7 @@ public class CraftWorld implements World {
|
||||
@@ -1216,7 +1216,7 @@ public class CraftWorld implements World {
|
||||
} else if (TNTPrimed.class.isAssignableFrom(clazz)) {
|
||||
entity = new EntityTNTPrimed(world, x, y, z, null);
|
||||
} else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
|
||||
|
@ -1,14 +1,14 @@
|
||||
From b460a12daf84e66911ff439a1605fa058aaaa35e Mon Sep 17 00:00:00 2001
|
||||
From 658b49a1c546172fd548a57b28ebc14b5f47ff54 Mon Sep 17 00:00:00 2001
|
||||
From: Brokkonaut <hannos17@gmx.de>
|
||||
Date: Tue, 7 Feb 2017 16:55:35 -0600
|
||||
Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 4be7173bf2..7d77c5fb31 100644
|
||||
index c96f1b2753..4973721243 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -327,7 +327,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@@ -338,7 +338,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
// Spigot start
|
||||
org.spigotmc.SlackActivityAccountant activityAccountant = this.world.getMinecraftServer().slackActivityAccountant;
|
||||
activityAccountant.startActivity(0.5);
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 04394aa31f043947da9b7c674852016776da133d Mon Sep 17 00:00:00 2001
|
||||
From 3df55783b95d0434f69f9fb85cc4db2cb5e993ac Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Fri, 9 Jun 2017 07:24:34 -0700
|
||||
Subject: [PATCH] Add configuration option to prevent player names from being
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 644e01101..329950802 100644
|
||||
index 644e011017..329950802f 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -275,4 +275,9 @@ public class PaperConfig {
|
||||
@ -20,10 +20,10 @@ index 644e01101..329950802 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index d7247a1ec..ff9346023 100644
|
||||
index 35b26d6128..8412e71d71 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1987,5 +1987,10 @@ public final class CraftServer implements Server {
|
||||
@@ -1989,5 +1989,10 @@ public final class CraftServer implements Server {
|
||||
commandMap.registerServerAliases();
|
||||
return true;
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ba46169bb1c11766a1570d04a2d16509993c141b Mon Sep 17 00:00:00 2001
|
||||
From c1dafcce6dd2f9cd431fd85a44036602e7013fbf Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Fri, 9 Jun 2017 19:03:43 +0200
|
||||
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
|
||||
@ -199,7 +199,7 @@ index bf1fffcfee..af430b73f0 100644
|
||||
System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
|
||||
System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 8576545bb7..0808da26f6 100644
|
||||
index db09d391ea..41ee97b1a4 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -57,7 +57,6 @@ import org.apache.commons.lang3.Validate;
|
||||
@ -271,7 +271,7 @@ index 0b0d996523..4cbe148010 100644
|
||||
|
||||
this.k = new GameProfileBanList(PlayerList.a);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index ff93460235..21d9f381cc 100644
|
||||
index 8412e71d71..47b4c01067 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -137,8 +137,8 @@ import java.nio.ByteBuffer;
|
||||
@ -284,7 +284,7 @@ index ff93460235..21d9f381cc 100644
|
||||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.craftbukkit.block.data.CraftBlockData;
|
||||
@@ -1123,9 +1123,13 @@ public final class CraftServer implements Server {
|
||||
@@ -1124,9 +1124,13 @@ public final class CraftServer implements Server {
|
||||
return logger;
|
||||
}
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
From 8cc7d79a757d71e277e0699e18699769b8b131fb Mon Sep 17 00:00:00 2001
|
||||
From 43a73429e4e31a393e524f7b3068e54b6de79597 Mon Sep 17 00:00:00 2001
|
||||
From: Sweepyoface <github@sweepy.pw>
|
||||
Date: Sat, 17 Jun 2017 18:48:21 -0400
|
||||
Subject: [PATCH] Add UnknownCommandEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 21d9f381cc..814a65ec58 100644
|
||||
index 47b4c01067..ca696b2417 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -79,6 +79,7 @@ import org.bukkit.craftbukkit.util.Versioning;
|
||||
@ -16,7 +16,7 @@ index 21d9f381cc..814a65ec58 100644
|
||||
import org.bukkit.event.inventory.InventoryType;
|
||||
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
|
||||
import org.bukkit.event.server.BroadcastMessageEvent;
|
||||
@@ -720,7 +721,13 @@ public final class CraftServer implements Server {
|
||||
@@ -721,7 +722,13 @@ public final class CraftServer implements Server {
|
||||
|
||||
// Spigot start
|
||||
if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a3979ad06f4ed58539c5cebb7de2c88544d3ad33 Mon Sep 17 00:00:00 2001
|
||||
From d97b85a66563487e861582b8b2a54458c8425f09 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 15 Jan 2018 22:11:48 -0500
|
||||
Subject: [PATCH] Basic PlayerProfile API
|
||||
@ -429,7 +429,7 @@ index 381542e0d2..80927de08b 100644
|
||||
* Calculates distance between 2 entities
|
||||
* @param e1
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 0808da26f6..cdcc375923 100644
|
||||
index 41ee97b1a4..8e72220f37 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1162,7 +1162,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
||||
@ -486,10 +486,10 @@ index a47a51a412..4c476f757c 100644
|
||||
|
||||
private UserCacheEntry(GameProfile gameprofile, Date date) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 814a65ec58..202c6c4927 100644
|
||||
index ca696b2417..213eb3f4aa 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -152,6 +152,10 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey;
|
||||
@@ -153,6 +153,10 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey;
|
||||
import org.bukkit.event.server.TabCompleteEvent;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
|
||||
@ -500,7 +500,7 @@ index 814a65ec58..202c6c4927 100644
|
||||
public final class CraftServer implements Server {
|
||||
private final String serverName = "Paper"; // Paper
|
||||
private final String serverVersion;
|
||||
@@ -2003,5 +2007,21 @@ public final class CraftServer implements Server {
|
||||
@@ -2005,5 +2009,21 @@ public final class CraftServer implements Server {
|
||||
public boolean suggestPlayerNamesWhenNullTabCompletions() {
|
||||
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
From b46069d74f4963e51238e355c4bf70b1f8a4b84c Mon Sep 17 00:00:00 2001
|
||||
From a7caf052e8586f81c16f32cebf9ceb38ee599153 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 17 Jun 2017 15:18:30 -0400
|
||||
Subject: [PATCH] Shoulder Entities Release API
|
||||
@ -62,10 +62,10 @@ index 42c6249535..b20cab58b1 100644
|
||||
public abstract boolean isSpectator();
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||
index 073c8acf2c..9e2fc4947c 100644
|
||||
index d96c6afdb3..e06ac23852 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||
@@ -445,6 +445,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
||||
@@ -454,6 +454,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
||||
getHandle().getCooldownTracker().a(CraftMagicNumbers.getItem(material), ticks);
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3e175150c0df5d545748e4fd74dd2c0c884a5e9b Mon Sep 17 00:00:00 2001
|
||||
From a521466350c33583f337ec4eb7ae52362b594861 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 26 Nov 2017 13:19:58 -0500
|
||||
Subject: [PATCH] AsyncTabCompleteEvent
|
||||
@ -14,7 +14,7 @@ completion, such as offline players.
|
||||
Also adds isCommand and getLocation to the sync TabCompleteEvent
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 619f020ba4..5778bf1c65 100644
|
||||
index bfaeaa7559..90ac83b5b1 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -504,18 +504,60 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||
@ -85,10 +85,10 @@ index 619f020ba4..5778bf1c65 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 202c6c4927..c74831b3d7 100644
|
||||
index 213eb3f4aa..ed8d0de9fa 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1667,7 +1667,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1669,7 +1669,7 @@ public final class CraftServer implements Server {
|
||||
offers = tabCompleteChat(player, message);
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6ede5e57de6ec91bdb2a1fefbdc54539c7676010 Mon Sep 17 00:00:00 2001
|
||||
From bd5033a7e28d0ad24b413b011cfda0ad8d05ad2d Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 22 Mar 2018 01:40:24 -0400
|
||||
Subject: [PATCH] getPlayerUniqueId API
|
||||
@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
|
||||
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index c74831b3d7..e860a83d3f 100644
|
||||
index ed8d0de9fa..6d23320e6c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1361,6 +1361,26 @@ public final class CraftServer implements Server {
|
||||
@@ -1362,6 +1362,26 @@ public final class CraftServer implements Server {
|
||||
return recipients.size();
|
||||
}
|
||||
|
||||
|
@ -1,14 +1,14 @@
|
||||
From 1d5afa94e8d93c45c29bbab7ce04a054fdc1a2ff Mon Sep 17 00:00:00 2001
|
||||
From 846943696efc9b1ccacf885d7badf1dc90addfdc Mon Sep 17 00:00:00 2001
|
||||
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
||||
Date: Sun, 1 Apr 2018 02:29:37 +0300
|
||||
Subject: [PATCH] Add method to open already placed sign
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||
index 9e2fc4947c..4b9ecb4a62 100644
|
||||
index e06ac23852..6f1659b221 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||
@@ -508,4 +508,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
||||
@@ -517,4 +517,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
||||
entity.remove();
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 08b71aa513ffb287734f6a8222dadbc7fc4d37b0 Mon Sep 17 00:00:00 2001
|
||||
From cdf38ff5f4faa5cb5d280968ba11078321ea8c54 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 15 Aug 2017 22:29:12 -0400
|
||||
Subject: [PATCH] Expand World.spawnParticle API and add Builder
|
||||
@ -37,10 +37,10 @@ index 5d5f6f6328..d506503e93 100644
|
||||
|
||||
if (this.a(entityplayer, false, d0, d1, d2, packetplayoutworldparticles)) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index 7004f11764..1afb480f86 100644
|
||||
index b3756074b5..62638d4e25 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -1576,13 +1576,17 @@ public class CraftWorld implements World {
|
||||
@@ -1572,13 +1572,17 @@ public class CraftWorld implements World {
|
||||
spawnParticle(particle, location.getX(), location.getY(), location.getZ(), count, offsetX, offsetY, offsetZ, extra, data);
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 986bbb97de3f713746ad2dbfb019241f14a787f8 Mon Sep 17 00:00:00 2001
|
||||
From a05cc2ae56fad0c73d3bd41977a09ef3ec6c4d1f Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 4 Jun 2018 20:39:20 -0400
|
||||
Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
|
||||
@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
|
||||
Item can be set inside of the Consumer pre spawn function.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index 1afb480f86..f7eaecb3fe 100644
|
||||
index 62638d4e25..affbb93bfd 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -936,6 +936,10 @@ public class CraftWorld implements World {
|
||||
@@ -932,6 +932,10 @@ public class CraftWorld implements World {
|
||||
if (Boat.class.isAssignableFrom(clazz)) {
|
||||
entity = new EntityBoat(world, x, y, z);
|
||||
entity.setPositionRotation(x, y, z, yaw, pitch);
|
||||
|
@ -1,4 +1,4 @@
|
||||
From b676c9fc36769db1c201f65a7a7226227347f4e9 Mon Sep 17 00:00:00 2001
|
||||
From 067f19f3dc53dc4a36ac8914fe3a868f3baf5542 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 20 Jun 2018 23:17:24 -0400
|
||||
Subject: [PATCH] Expand Explosions API
|
||||
@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
|
||||
Add Entity as a Source capability, and add more API choices, and on Location.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index f7eaecb3fe..e8290759bb 100644
|
||||
index affbb93bfd..23f0d5cb7d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -548,6 +548,11 @@ public class CraftWorld implements World {
|
||||
@@ -544,6 +544,11 @@ public class CraftWorld implements World {
|
||||
public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
|
||||
return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks).wasCanceled;
|
||||
}
|
||||
|
@ -1,14 +1,14 @@
|
||||
From 454babc0dd55c39343955aaad2b704df8d31d91a Mon Sep 17 00:00:00 2001
|
||||
From d5f1f0035b77ba250cb2f94108088f729b0ba670 Mon Sep 17 00:00:00 2001
|
||||
From: Brokkonaut <hannos17@gmx.de>
|
||||
Date: Tue, 3 Jul 2018 16:08:14 +0200
|
||||
Subject: [PATCH] Implement World.getEntity(UUID) API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index e8290759bb..0f4a894ebb 100644
|
||||
index 23f0d5cb7d..54a605f9b9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -756,6 +756,14 @@ public class CraftWorld implements World {
|
||||
@@ -752,6 +752,14 @@ public class CraftWorld implements World {
|
||||
return list;
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0afba65cf3655e8488aed1e76126c9ac4fe87b90 Mon Sep 17 00:00:00 2001
|
||||
From 1aad30bce0b3ac8af14c4d614abcf473189ef3ee Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 3 Jul 2018 21:56:23 -0400
|
||||
Subject: [PATCH] InventoryCloseEvent Reason API
|
||||
@ -136,10 +136,10 @@ index 45e42e9989..7a2b219c67 100644
|
||||
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
|
||||
cserver.getPluginManager().callEvent(playerQuitEvent);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||
index 4b9ecb4a62..b602a5d1b9 100644
|
||||
index 6f1659b221..26b30a1503 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||
@@ -402,8 +402,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
||||
@@ -411,8 +411,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
||||
}
|
||||
|
||||
public void closeInventory() {
|
||||
|
@ -1,11 +1,11 @@
|
||||
From fc2eced1f0c62db6c0eea3efac000fd94ad623a6 Mon Sep 17 00:00:00 2001
|
||||
From a3712df43902f6a1a841759c5c8e32c9187e9a99 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 23 Jul 2018 19:13:06 -0400
|
||||
Subject: [PATCH] Thread Safe Iteration of Chunk Scheduler
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
index 7b30687530..45f9ad3726 100644
|
||||
index 7629e0d054..5ee8bedf34 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
@@ -1,8 +1,10 @@
|
||||
@ -19,7 +19,7 @@ index 7b30687530..45f9ad3726 100644
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.Consumer;
|
||||
@@ -79,7 +81,13 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
|
||||
@@ -85,7 +87,13 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
|
||||
}
|
||||
|
||||
public void a() {
|
||||
@ -34,7 +34,7 @@ index 7b30687530..45f9ad3726 100644
|
||||
ProtoChunk protochunk = (ProtoChunk) scheduler_a.a();
|
||||
|
||||
if (protochunk.h() && protochunk.i().d() == ChunkStatus.Type.PROTOCHUNK) {
|
||||
@@ -87,6 +95,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
|
||||
@@ -93,6 +101,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
|
||||
protochunk.setLastSaved(this.c.getTime());
|
||||
this.e.saveChunk(this.c, protochunk);
|
||||
protochunk.a(false);
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit f025ddf8133a837fa36a4220caefa1701c4e3466
|
||||
Subproject commit 3607913caf81560ff9e809aba8e6fcbfebab4d02
|
@ -1 +1 @@
|
||||
Subproject commit 9646d8d7800931effa31be173fda765ecdf996c4
|
||||
Subproject commit 1ef1ffd664b55d9dc9800023182c779daff2594a
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren