Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Updated Upstream (Spigot) (#4745)"

Browse Source 
This reverts commit e38eceb42a.
This commit is contained in:
Shane Freeder 2020-11-09 00:09:37 +00:00
parent e38eceb42a
commit 611a0ee52d
393 changed files with 166 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Check online mode before converting and renaming player data
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
index 88e0c5167ce545ef98868947b2722c55bbc46687..6a9e0e644801ddc5f18a47d15d5f6d5b6dc13004 100644 index 9190e7c6de201868b909f0724930f13f7ec82edf..9d81bb896e3688c644edf93cd9dfeadd9cdf8836 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -49,7 +49,7 @@ public class WorldNBTStorage { @@ -48,7 +48,7 @@ public class WorldNBTStorage {
File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat"); File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat");
// Spigot Start // Spigot Start
boolean usingWrongFile = false; boolean usingWrongFile = false;

36
Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch Normal file
View File

@ -0,0 +1,36 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Mon, 26 Mar 2018 18:30:53 +0300
Subject: [PATCH] Make player data saving configurable
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index cee8740e644c492e3d71fd58791e7d52d57e856d..f22bed69f690f6e4754b87dd61cebe9c6627b12d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -271,4 +271,13 @@ public class PaperConfig {
private static void authenticationServersDownKickMessage() {
authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
}
+
+ public static boolean savePlayerData = true;
+ private static void savePlayerData() {
+ savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
+ if(!savePlayerData) {
+ Bukkit.getLogger().log(Level.WARNING, "Player Data Saving is currently disabled. Any changes to your players data, " +
+ "such as inventories, experience points, advancements and the like will not be saved when they log out.");
+ }
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
index 9d81bb896e3688c644edf93cd9dfeadd9cdf8836..af9e94a87a946a4a9e2579a87f3f5a7adeb66f25 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -25,6 +25,7 @@ public class WorldNBTStorage {
}
public void save(EntityHuman entityhuman) {
+ if(!com.destroystokyo.paper.PaperConfig.savePlayerData) return; // Paper - Make player data saving configurable
try {
NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
File file = File.createTempFile(entityhuman.getUniqueIDString() + "-", ".dat", this.playerDir);

0
Spigot-Server-Patches/0203-Make-legacy-ping-handler-more-reliable.patch → Spigot-Server-Patches/0204-Make-legacy-ping-handler-more-reliable.patch
View File

0
Spigot-Server-Patches/0204-Call-PaperServerListPingEvent-for-legacy-pings.patch → Spigot-Server-Patches/0205-Call-PaperServerListPingEvent-for-legacy-pings.patch
View File

2
Spigot-Server-Patches/0205-Flag-to-disable-the-channel-limit.patch → Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch
View File

@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
provide an optional flag to disable this check, at your own risk. provide an optional flag to disable this check, at your own risk.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 79db5b2c858f952b8bca089500dfd18db084f2e7..c24a0c6bd72b4b2cbc2432d5e1651c3c396e4baf 100644 index 1721f3c937450eacfcb48df482535e6cf1f24fe3..df1896d447295123dbf7f8c8dea163be7849132f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -141,6 +141,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -141,6 +141,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

0
Spigot-Server-Patches/0206-Add-method-to-open-already-placed-sign.patch → Spigot-Server-Patches/0207-Add-method-to-open-already-placed-sign.patch
View File

2
Spigot-Server-Patches/0207-Configurable-sprint-interruption-on-attack.patch → Spigot-Server-Patches/0208-Configurable-sprint-interruption-on-attack.patch
View File

@ -20,7 +20,7 @@ index 3804c7cf96087cdf94fd5fbdce4ebcdafa9e0019..873f81c74a94f6d76edd45e34ddc476d
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 7e9a077a6e6af34c06910d1381399eed81f9fc20..d340ec2fed8a4308d1fd2e998e6716e42d84fb98 100644 index 49f051a1f47c73a66cc462b3eecf72c4e932b648..9a55d1e6f4c6632c1f27d8c1fac55abc3c3d8204 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1086,7 +1086,11 @@ public abstract class EntityHuman extends EntityLiving { @@ -1086,7 +1086,11 @@ public abstract class EntityHuman extends EntityLiving {

0
Spigot-Server-Patches/0208-Fix-exploit-that-allowed-colored-signs-to-be-created.patch → Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
View File

0
Spigot-Server-Patches/0209-EndermanEscapeEvent.patch → Spigot-Server-Patches/0210-EndermanEscapeEvent.patch
View File

2
Spigot-Server-Patches/0210-Enderman.teleportRandomly.patch → Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index b9ede7d533a813f4de27404dc14b0ef99c8fcd62..1e7aa2ee1c399bf3484e0245d57ab428d48d32f5 100644 index f20283585464d54c4c5da294cf19261c2d258c97..c256fa48d64776ae7a7b21d42fb87c0a8ca7f3bc 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java --- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -224,6 +224,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { @@ -224,6 +224,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {

0
Spigot-Server-Patches/0211-Block-Enderpearl-Travel-Exploit.patch → Spigot-Server-Patches/0212-Block-Enderpearl-Travel-Exploit.patch
View File

0
Spigot-Server-Patches/0212-Expand-World.spawnParticle-API-and-add-Builder.patch → Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch
View File

2
Spigot-Server-Patches/0213-EndermanAttackPlayerEvent.patch → Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch
View File

@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
This allows you to override/extend the pumpkin/stare logic. This allows you to override/extend the pumpkin/stare logic.
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index 1e7aa2ee1c399bf3484e0245d57ab428d48d32f5..f4b823882e1e842c897c7946f7d1a46ce5366de0 100644 index c256fa48d64776ae7a7b21d42fb87c0a8ca7f3bc..d03c0b4ea5fad793a7bedad5ae3be0b779dc458c 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java --- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -167,7 +167,15 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { @@ -167,7 +167,15 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {

2
Spigot-Server-Patches/0214-WitchConsumePotionEvent.patch → Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent
Fires when a witch consumes the potion in their hand Fires when a witch consumes the potion in their hand
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
index fd54fbe9d331a8065ecfea90e54975b5d8e6368a..44a744f0af2de92c33a43eaaf7de6f027e1d4e29 100644 index 43bc7f509b00b40c3fa7031546a52154c39b093d..4f2212ed9abb00e86c3d80d7facc7298f7a07b89 100644
--- a/src/main/java/net/minecraft/server/EntityWitch.java --- a/src/main/java/net/minecraft/server/EntityWitch.java
+++ b/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -85,7 +85,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -85,7 +85,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {

2
Spigot-Server-Patches/0215-WitchThrowPotionEvent.patch → Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent
Fired when a witch throws a potion at a player Fired when a witch throws a potion at a player
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
index 44a744f0af2de92c33a43eaaf7de6f027e1d4e29..58949acbcb69649366df16a0d55e822a039e4d9a 100644 index 4f2212ed9abb00e86c3d80d7facc7298f7a07b89..2e085e3c4021719eeaefa0a3323f03567e988c81 100644
--- a/src/main/java/net/minecraft/server/EntityWitch.java --- a/src/main/java/net/minecraft/server/EntityWitch.java
+++ b/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {

0
Spigot-Server-Patches/0216-Allow-spawning-Item-entities-with-World.spawnEntity.patch → Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch
View File

2
Spigot-Server-Patches/0217-WitchReadyPotionEvent.patch → Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] WitchReadyPotionEvent
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
index 58949acbcb69649366df16a0d55e822a039e4d9a..0703124e5137ff0a5ae4d025488eb343d2813067 100644 index 2e085e3c4021719eeaefa0a3323f03567e988c81..fc58cce8455dcf244355189fabb1a76114c19368 100644
--- a/src/main/java/net/minecraft/server/EntityWitch.java --- a/src/main/java/net/minecraft/server/EntityWitch.java
+++ b/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -118,7 +118,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -118,7 +118,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {

0
Spigot-Server-Patches/0218-ItemStack-getMaxItemUseDuration.patch → Spigot-Server-Patches/0219-ItemStack-getMaxItemUseDuration.patch
View File

2
Spigot-Server-Patches/0219-Implement-EntityTeleportEndGatewayEvent.patch → Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
index 6a0f7b02c5a2663bb7304a1f8c6cbf1603507d45..5550fd9ea6bcae07dcdf431322cb0da0b26a6d71 100644 index 717c736cbc4defd24c5d08b501227bbd3e00a7e8..8eb1520d603aa59650418ee12cb1031168271fea 100644
--- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
+++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
@@ -168,9 +168,20 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick @@ -168,9 +168,20 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick

2
Spigot-Server-Patches/0220-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch → Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
Otherwise the creeper infinite explodes Otherwise the creeper infinite explodes
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 7b9188a33c079155a7ff5b0e5de854550324f0f1..647795bc7ea68f9dbe9d3f6488eaec82159feb9f 100644 index 749c6e21cbd01a81196476728def640ba46a5783..055272e49ff522a009fcd335e2183172ada11c35 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java --- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster { @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster {

0
Spigot-Server-Patches/0221-Fix-CraftEntity-hashCode.patch → Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch
View File

8
Spigot-Server-Patches/0222-Configurable-Alternative-LootPool-Luck-Formula.patch → Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch
View File

@ -36,12 +36,12 @@ This change will result in some major changes to fishing formulas.
I would love to see this change in Vanilla, so Mojang please pull :) I would love to see this change in Vanilla, so Mojang please pull :)
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 5fe6c36bdf8527d7fcb41e8d471194c7e395b946..0b2f77e37f9b13aef6af7d1254aaeec56c4e55c9 100644 index f22bed69f690f6e4754b87dd61cebe9c6627b12d..c8a7d8092a2849b62a8d83d7970756fd76100025 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -271,4 +271,12 @@ public class PaperConfig { @@ -280,4 +280,12 @@ public class PaperConfig {
private static void authenticationServersDownKickMessage() { "such as inventories, experience points, advancements and the like will not be saved when they log out.");
authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage)); }
} }
+ +
+ public static boolean useAlternativeLuckFormula = false; + public static boolean useAlternativeLuckFormula = false;

2
Spigot-Server-Patches/0223-Print-Error-details-when-failing-to-save-player-data.patch → Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Print Error details when failing to save player data
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
index 6a9e0e644801ddc5f18a47d15d5f6d5b6dc13004..b5cf60495b85c6ae6c32ee8a1c65d80e59fdce3d 100644 index af9e94a87a946a4a9e2579a87f3f5a7adeb66f25..859d604cf9bf72aff261af39eec495959a9ac04b 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -36,7 +36,7 @@ public class WorldNBTStorage { @@ -36,7 +36,7 @@ public class WorldNBTStorage {

2
Spigot-Server-Patches/0224-Make-shield-blocking-delay-configurable.patch → Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch
View File

@ -19,7 +19,7 @@ index 69009246f12cc3acb0055af746e01097fa668e1b..35075ffac394153e28039809e0ed48fe
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0bfc3a7a532a166497eff75ed355f05c96e216c4..5ecb82078f884946e83a15b254196e39986b7424 100644 index ddcaa435f87171bd3940089c30ba6eea73546e1f..7175a1146fbad4aa91f898a45415432bc27976da 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3199,7 +3199,7 @@ public abstract class EntityLiving extends Entity { @@ -3199,7 +3199,7 @@ public abstract class EntityLiving extends Entity {

4
Spigot-Server-Patches/0225-Improve-EntityShootBowEvent.patch → Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Improve EntityShootBowEvent
Adds missing call to Illagers and also adds Arrow ItemStack to skeltons Adds missing call to Illagers and also adds Arrow ItemStack to skeltons
diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
index b00a18643ea8425c5008a25563dbaa17d1a82ca4..50442b3a498d1bab4270e69952a79f5182153ece 100644 index 435b755fdcfa64b4f8c4167e375d59e3ac8f23fb..ff8efca2616cb14d9e79e03e3d08781d2547b8eb 100644
--- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
+++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
@@ -134,8 +134,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan @@ -134,8 +134,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@ -30,7 +30,7 @@ index b00a18643ea8425c5008a25563dbaa17d1a82ca4..50442b3a498d1bab4270e69952a79f51
class a extends EntityIllagerWizard.PathfinderGoalCastSpell { class a extends EntityIllagerWizard.PathfinderGoalCastSpell {
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
index 48c7ba6ecc4ab42805363e31d0864fb685c8d3ca..ced89af70ca791bfe42c4e2d21604997a0cf3e0f 100644 index ac013d55c5df502d8a8cdf18237a0ca956a444c4..513bb3087ea8e81d36dcc8f78e22b6c63b26f582 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
@@ -155,7 +155,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR @@ -155,7 +155,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR

2
Spigot-Server-Patches/0226-PlayerReadyArrowEvent.patch → Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch
View File

@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
Plugins can skip selection of certain arrows and control which is used. Plugins can skip selection of certain arrows and control which is used.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index d340ec2fed8a4308d1fd2e998e6716e42d84fb98..bd031108edadd98050bcfe5bc9f702600bde266b 100644 index 9a55d1e6f4c6632c1f27d8c1fac55abc3c3d8204..85d2f4bab52cef2822fb0431c9cf7b7becbd5ee7 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -2044,6 +2044,17 @@ public abstract class EntityHuman extends EntityLiving { @@ -2044,6 +2044,17 @@ public abstract class EntityHuman extends EntityLiving {

6
Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch → Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
This event is called when an entity receives knockback by another entity. This event is called when an entity receives knockback by another entity.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index bd031108edadd98050bcfe5bc9f702600bde266b..cbffebfe323ff4ddec792c49ebc3391fc9ac35ac 100644 index 85d2f4bab52cef2822fb0431c9cf7b7becbd5ee7..0f7e162b342ac589dc357508a1dcd1ab02d1fe3e 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1080,7 +1080,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -1080,7 +1080,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -28,7 +28,7 @@ index bd031108edadd98050bcfe5bc9f702600bde266b..cbffebfe323ff4ddec792c49ebc3391f
// CraftBukkit end // CraftBukkit end
} }
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 1b0c4234cf579b35f404c129c2c6d3266b670b09..38bf49da2cc6b2f7068462ea8b57cf3a76ae1779 100644 index ab96dd1ac20998b6458ecf6f3fb6f5a2d5189eba..90c38aed8f546987e45b9fd3ae9aa11b2e1f2084 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java --- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1500,7 +1500,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -1500,7 +1500,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -41,7 +41,7 @@ index 1b0c4234cf579b35f404c129c2c6d3266b670b09..38bf49da2cc6b2f7068462ea8b57cf3a
} }
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 5ecb82078f884946e83a15b254196e39986b7424..a962f695f3f3508f8ce32f72a56990eb0e601589 100644 index 7175a1146fbad4aa91f898a45415432bc27976da..4c6c0b3b77b3cea9abf4a9e6dec4872201db7b7b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1240,7 +1240,7 @@ public abstract class EntityLiving extends Entity { @@ -1240,7 +1240,7 @@ public abstract class EntityLiving extends Entity {

0
Spigot-Server-Patches/0228-Expand-Explosions-API.patch → Spigot-Server-Patches/0229-Expand-Explosions-API.patch
View File

0
Spigot-Server-Patches/0229-LivingEntity-Hand-Raised-Item-Use-API.patch → Spigot-Server-Patches/0230-LivingEntity-Hand-Raised-Item-Use-API.patch
View File

0
Spigot-Server-Patches/0230-RangedEntity-API.patch → Spigot-Server-Patches/0231-RangedEntity-API.patch
View File

0
Spigot-Server-Patches/0231-Add-config-to-disable-ender-dragon-legacy-check.patch → Spigot-Server-Patches/0232-Add-config-to-disable-ender-dragon-legacy-check.patch
View File

0
Spigot-Server-Patches/0232-Implement-World.getEntity-UUID-API.patch → Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch
View File

0
Spigot-Server-Patches/0233-InventoryCloseEvent-Reason-API.patch → Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch
View File

2
Spigot-Server-Patches/0234-Vex-getSummoner-API.patch → Spigot-Server-Patches/0235-Vex-getSummoner-API.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API
Get's the NPC that summoned this Vex Get's the NPC that summoned this Vex
diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
index ffcb0e1bfbb196ddcbc144fa83d1525398970309..b84eb0394ab9a53e32b774682bc42b067625195e 100644 index d69beb58d805d442e346725020fe47582841000f..a8e9b1e83969f4e49465fc5e8b5fb8a5efe5f81d 100644
--- a/src/main/java/net/minecraft/server/EntityVex.java --- a/src/main/java/net/minecraft/server/EntityVex.java
+++ b/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java
@@ -89,6 +89,7 @@ public class EntityVex extends EntityMonster { @@ -89,6 +89,7 @@ public class EntityVex extends EntityMonster {

0
Spigot-Server-Patches/0235-Refresh-player-inventory-when-cancelling-PlayerInter.patch → Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch
View File

2
Spigot-Server-Patches/0236-Don-t-change-the-Entity-Random-seed-for-squids.patch → Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Don't change the Entity Random seed for squids
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index 050c4bdac8519250157b77c3221c99bd49e53a22..b21605a62365fe24f315f35bd840b4740fc80f0e 100644 index 6a436c6edb4f2f17bbb165ff6497c15e476d3317..03d707ed09e08baf3992b3f4a0cc7e42e412d16b 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java --- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal { @@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal {

0
Spigot-Server-Patches/0237-Re-add-vanilla-entity-warnings-for-duplicates.patch → Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch
View File

2
Spigot-Server-Patches/0238-Avoid-item-merge-if-stack-size-above-max-stack-size.patch → Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Avoid item merge if stack size above max stack size
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 7e1cc212e22f21bec1f6b1a2d337ef2ee70dc699..fde34e4c0c95d23a006304f26339a60ea6cf51fa 100644 index 6d9a03a1ccc78ae9eeb654dd7fab9f23fcce74b8..78a2e28c9fe93cdbb2a7326a5d6fcb596724ad30 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java --- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -182,6 +182,10 @@ public class EntityItem extends Entity { @@ -182,6 +182,10 @@ public class EntityItem extends Entity {

2
Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch → Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 0c7a485ae7c2fbb5aa4c892d75a314a75056ba9a..2349491a15393a450d80397dd92c5733b28a3482 100644 index e3630cd3847c6a5d5b3c8a37fe6f101f938b8700..c10888b862541e244c9c9c60d45ef9fee59ae3e8 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -78,6 +78,13 @@ @@ -78,6 +78,13 @@

0
Spigot-Server-Patches/0240-add-more-information-to-Entity.toString.patch → Spigot-Server-Patches/0241-add-more-information-to-Entity.toString.patch
View File

0
Spigot-Server-Patches/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch → Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
View File

0
Spigot-Server-Patches/0242-EnderDragon-Events.patch → Spigot-Server-Patches/0243-EnderDragon-Events.patch
View File

0
Spigot-Server-Patches/0243-PlayerElytraBoostEvent.patch → Spigot-Server-Patches/0244-PlayerElytraBoostEvent.patch
View File

0
Spigot-Server-Patches/0244-Improve-BlockPosition-inlining.patch → Spigot-Server-Patches/0245-Improve-BlockPosition-inlining.patch
View File

0
Spigot-Server-Patches/0245-Optimize-RegistryID.c.patch → Spigot-Server-Patches/0246-Optimize-RegistryID.c.patch
View File

4
Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch → Spigot-Server-Patches/0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
View File

@ -19,7 +19,7 @@ index 6352051ab937d4d365e823a7112e76dc3ec34225..92ddf96f7db08a2b390ef3f49b0643f9
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 96c229e5dd214d32478fe4d5b96e77d8ba2bc93c..2592a59e9506cee901802a3bdc78db8832700fd8 100644 index f2938b115aa34158e76da9f974f5746ed43630e1..0330bdf46a3baba169dd226261094a18a6aecf54 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -314,6 +314,7 @@ public class EntityArmorStand extends EntityLiving { @@ -314,6 +314,7 @@ public class EntityArmorStand extends EntityLiving {
@ -31,7 +31,7 @@ index 96c229e5dd214d32478fe4d5b96e77d8ba2bc93c..2592a59e9506cee901802a3bdc78db88
for (int i = 0; i < list.size(); ++i) { for (int i = 0; i < list.size(); ++i) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6003201197a89fa6c46c35d711a53db690295b1e..23a38825b71ea981538f32368705e7a7b98dadaf 100644 index 6ebf3884a289d0be081d43d012ac10796740cc1e..909e01e458d729f277797bf1dca564f927318460 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -801,6 +801,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -801,6 +801,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

8
Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch → Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index e0ae51ede44de5c894df526c1fc6d94c46d72013..8bcca73ae48ee822d32a6d23be2e1056a376e5f6 100644 index 2d3e498d5c40e573aad88fd0fce7943e930956ba..8ba7718b61ad9f6c8537b44265818ecbcffbfb63 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java --- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -453,6 +453,7 @@ public abstract class BlockBase { @@ -453,6 +453,7 @@ public abstract class BlockBase {
@ -17,7 +17,7 @@ index e0ae51ede44de5c894df526c1fc6d94c46d72013..8bcca73ae48ee822d32a6d23be2e1056
return this.getBlock().c(this.p(), iblockaccess, blockposition, voxelshapecollision); return this.getBlock().c(this.p(), iblockaccess, blockposition, voxelshapecollision);
} }
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c863fd94ee77b81aec84223588e20eed974515d6..02e4ce705c2a7a1cdc7024a6c3db799db8922ce9 100644 index d0e077084b84e44336878410aa9a44fed7408670..76ffbcec75fb1e22190179cf1f6ef7e417268ded 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -96,7 +96,7 @@ index ed0f9c5d29c4f88b7beee4b0ecdd7a56de2d7a9e..881cea7c466f29ff4a89db28d104e850
if (operatorboolean.apply(false, false)) { if (operatorboolean.apply(false, false)) {
throw (IllegalArgumentException) SystemUtils.c((Throwable) (new IllegalArgumentException())); throw (IllegalArgumentException) SystemUtils.c((Throwable) (new IllegalArgumentException()));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 23a38825b71ea981538f32368705e7a7b98dadaf..514be9c4356380627032c54b4b1eda37aaefe16d 100644 index 909e01e458d729f277797bf1dca564f927318460..4b28cb07e24a2deb18e2c7e97f25fee1d32e0d25 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -178,6 +178,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -178,6 +178,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -147,7 +147,7 @@ index 23a38825b71ea981538f32368705e7a7b98dadaf..514be9c4356380627032c54b4b1eda37
public boolean s_() { public boolean s_() {
return this.isClientSide; return this.isClientSide;
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 52762d75edd35dd3bc9668e3f7a3c79be279b783..6458cd6823ea066588742f8105048001395e4dde 100644 index 0980c1f19340ac2bb044ff896f5ee6153c95bbd6..462cc4539c98787bb0c7e5925d8b6b06874120ca 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1209,6 +1209,14 @@ public class CraftEventFactory { @@ -1209,6 +1209,14 @@ public class CraftEventFactory {

0
Spigot-Server-Patches/0248-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch → Spigot-Server-Patches/0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
View File

2
Spigot-Server-Patches/0249-Add-some-Debug-to-Chunk-Entity-slices.patch → Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch
View File

@ -58,7 +58,7 @@ index edacc6da62593c94392f460cb6839ed5f8067dd4..18d55cea6258c7b59b79aec1bcdf3589
return; return;
} }
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 02e4ce705c2a7a1cdc7024a6c3db799db8922ce9..29b24fd75f06501a814868d1fab85c9b818bd316 100644 index 76ffbcec75fb1e22190179cf1f6ef7e417268ded..ef375f3987c26d70ba3f88e53f458bdccb6fc1ae 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
Spigot-Server-Patches/0250-SkeletonHorse-Additions.patch → Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] SkeletonHorse Additions
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
index bb23e313b236ceb81c60d62833dc6f5afee044eb..a53d335f3af9df80bec3f94f81fb5ff0e0e5ebb5 100644 index 187c21efe4899f84666af4007f34b488e3e7f7d4..abbc12c8e0767cf70ae5558979f1e49e8e52dd5c 100644
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {

0
Spigot-Server-Patches/0251-Prevent-Saving-Bad-entities-to-chunks.patch → Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch
View File

0
Spigot-Server-Patches/0252-Don-t-call-getItemMeta-on-hasItemMeta.patch → Spigot-Server-Patches/0253-Don-t-call-getItemMeta-on-hasItemMeta.patch
View File

0
Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch → Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch
View File

2
Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch → Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch
View File

@ -8,7 +8,7 @@ Add the following:
- Enable/Disable slot interactions - Enable/Disable slot interactions
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 2592a59e9506cee901802a3bdc78db8832700fd8..9b71e3207b0f41ab34871d5f4d7e87d90bc6446d 100644 index 0330bdf46a3baba169dd226261094a18a6aecf54..554bf021f05165438ef4a0db75f9654b4d4b5480 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -388,6 +388,7 @@ public class EntityArmorStand extends EntityLiving { @@ -388,6 +388,7 @@ public class EntityArmorStand extends EntityLiving {

0
Spigot-Server-Patches/0255-AnvilDamageEvent.patch → Spigot-Server-Patches/0256-AnvilDamageEvent.patch
View File

2
Spigot-Server-Patches/0256-Add-TNTPrimeEvent.patch → Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch
View File

@ -115,7 +115,7 @@ index c6fe9c1f7ef06c4524533130b493ca5e72bd1693..7b601955f3fd36f06c838b896b455a60
world.a(blockposition, false); world.a(blockposition, false);
} }
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index ef9df3c7c7c455373641f7a7c701f82a23ffef36..6bd55433fafcfd8079b8e7b1ce6b65daa13b83c1 100644 index 6ad63e5bb4b7bec976d1aef74547ff96f64204c6..8da02467dff4b9da644aa12e453d127b7a01e259 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock; @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;

6
Spigot-Server-Patches/0257-Break-up-and-make-tab-spam-limits-configurable.patch → Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch
View File

@ -22,10 +22,10 @@ to take the burden of this into their own hand without having to rely on
plugins doing unsafe things. plugins doing unsafe things.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 0b2f77e37f9b13aef6af7d1254aaeec56c4e55c9..cddc4d017596d0c83fcb9661e71cb647389ce9d6 100644 index f3e906902a3a90fd023050ebfae7ebc6d50311eb..e8d6cc7c116faaf168efdb0af0b2365bb7fb6eac 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -279,4 +279,18 @@ public class PaperConfig { @@ -288,4 +288,18 @@ public class PaperConfig {
Bukkit.getLogger().log(Level.INFO, "Using Aikar's Alternative Luck Formula to apply Luck attribute to all loot pool calculations. See https://luckformula.emc.gs"); Bukkit.getLogger().log(Level.INFO, "Using Aikar's Alternative Luck Formula to apply Luck attribute to all loot pool calculations. See https://luckformula.emc.gs");
} }
} }
@ -45,7 +45,7 @@ index 0b2f77e37f9b13aef6af7d1254aaeec56c4e55c9..cddc4d017596d0c83fcb9661e71cb647
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a62fcd57be08cce2aa51de078aa86e2eeb6f11e5..be2c94a8fb93ee024e035cc8557f230ee7c1c647 100644 index e025360ffdb54f91b2215076f24f9abb08d6718f..6e3d66ab776146e2204539319412ea8bde17d58a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -83,6 +83,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -83,6 +83,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

0
Spigot-Server-Patches/0258-Add-hand-to-bucket-events.patch → Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch
View File

2
Spigot-Server-Patches/0259-MC-135506-Experience-should-save-as-Integers.patch → Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] MC-135506: Experience should save as Integers
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index 4df7df781d12e38885ecfbc89dd1d42d9de14248..c2be0c2bc315876f120cff207e5516dda2bd55d7 100644 index a2eaea4bd847ebe0b3dc35c95c4c29d6c73f4797..e33a42dcd52ab1d027df542e044d84d42970559c 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -202,7 +202,7 @@ public class EntityExperienceOrb extends Entity { @@ -202,7 +202,7 @@ public class EntityExperienceOrb extends Entity {

0
Spigot-Server-Patches/0260-Fix-client-rendering-skulls-from-same-user.patch → Spigot-Server-Patches/0261-Fix-client-rendering-skulls-from-same-user.patch
View File

6
Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch → Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch
View File

@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
This will help diagnose what was going on in that time before the crash. This will help diagnose what was going on in that time before the crash.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index cddc4d017596d0c83fcb9661e71cb647389ce9d6..6a23438c11d4c758ef718e9575c548152052ff2f 100644 index e8d6cc7c116faaf168efdb0af0b2365bb7fb6eac..aaaaead8c740a22906612ca43147bd00eb4639f7 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration; @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@ -20,7 +20,7 @@ index cddc4d017596d0c83fcb9661e71cb647389ce9d6..6a23438c11d4c758ef718e9575c54815
public class PaperConfig { public class PaperConfig {
@@ -280,6 +281,14 @@ public class PaperConfig { @@ -289,6 +290,14 @@ public class PaperConfig {
} }
} }
@ -68,7 +68,7 @@ index f1bb3acf370ed71bc48116ce96396f999a34e83e..dce11770da204b09cdc2f89dceccb3cf
@Override @Override
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 18aca464506c6584be7a4d28cb303e9ace9bdc32..7fa844f168af9b622aaf44b4cb0e0e38132c95a0 100644 index 1cf214eaca80feae283f6524605976022f856116..e66050b87ace6544636e10123ad0963176e5fdf7 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java --- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -225,7 +225,7 @@ public class SpigotConfig @@ -225,7 +225,7 @@ public class SpigotConfig

0
Spigot-Server-Patches/0262-Make-EnderDragon-implement-Mob.patch → Spigot-Server-Patches/0263-Make-EnderDragon-implement-Mob.patch
View File

0
Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch → Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch
View File

0
Spigot-Server-Patches/0264-Use-a-Queue-for-Queueing-Commands.patch → Spigot-Server-Patches/0265-Use-a-Queue-for-Queueing-Commands.patch
View File

0
Spigot-Server-Patches/0265-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch → Spigot-Server-Patches/0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
View File

4
Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch → Spigot-Server-Patches/0267-Allow-disabling-armour-stand-ticking.patch
View File

@ -20,7 +20,7 @@ index 92ddf96f7db08a2b390ef3f49b0643f9d90bbea4..414b9077317022e4efc0b1e547d7f387
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a2987826e4317de 100644 index 554bf021f05165438ef4a0db75f9654b4d4b5480..fc86ae2519c8ff54ff7c5e45d7c45fcc16eefca0 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -46,9 +46,16 @@ public class EntityArmorStand extends EntityLiving { @@ -46,9 +46,16 @@ public class EntityArmorStand extends EntityLiving {
@ -137,7 +137,7 @@ index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a298782
this.datawatcher.set(EntityArmorStand.bh, vector3f); this.datawatcher.set(EntityArmorStand.bh, vector3f);
} }
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 51d1d9abcb66bef329fa2396e9e338b9d962733b..83d98b705875fa543de4f37b1234ad65e4e0604a 100644 index db84ddd62b627764ff5debc56095d37e81c94605..3a6e5cb459fb9866cf2e377b803501152ab7ce69 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2514,6 +2514,7 @@ public abstract class EntityLiving extends Entity { @@ -2514,6 +2514,7 @@ public abstract class EntityLiving extends Entity {

0
Spigot-Server-Patches/0267-Optimize-BlockPosition-helper-methods.patch → Spigot-Server-Patches/0268-Optimize-BlockPosition-helper-methods.patch
View File

0
Spigot-Server-Patches/0268-Restore-vanlla-default-mob-spawn-range.patch → Spigot-Server-Patches/0269-Restore-vanlla-default-mob-spawn-range.patch
View File

0
Spigot-Server-Patches/0269-Slime-Pathfinder-Events.patch → Spigot-Server-Patches/0270-Slime-Pathfinder-Events.patch
View File

0
Spigot-Server-Patches/0270-Configurable-speed-for-water-flowing-over-lava.patch → Spigot-Server-Patches/0271-Configurable-speed-for-water-flowing-over-lava.patch
View File

0
Spigot-Server-Patches/0271-Optimize-CraftBlockData-Creation.patch → Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch
View File

0
Spigot-Server-Patches/0272-Optimize-RegistryMaterials.patch → Spigot-Server-Patches/0273-Optimize-RegistryMaterials.patch
View File

0
Spigot-Server-Patches/0273-Add-PhantomPreSpawnEvent.patch → Spigot-Server-Patches/0274-Add-PhantomPreSpawnEvent.patch
View File

2
Spigot-Server-Patches/0274-Add-More-Creeper-API.patch → Spigot-Server-Patches/0275-Add-More-Creeper-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add More Creeper API
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 647795bc7ea68f9dbe9d3f6488eaec82159feb9f..79ef955070b2982be79cc58e40093624bd088ff0 100644 index 055272e49ff522a009fcd335e2183172ada11c35..ad422dfafbfcf62f6aa483dafa9764c274414d8d 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java --- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster { @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster {

0
Spigot-Server-Patches/0275-Inventory-removeItemAnySlot.patch → Spigot-Server-Patches/0276-Inventory-removeItemAnySlot.patch
View File

0
Spigot-Server-Patches/0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch → Spigot-Server-Patches/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
View File

2
Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch → Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 83d98b705875fa543de4f37b1234ad65e4e0604a..99dac0a315c29dd394ea3e8049da89c62ace65cc 100644 index 3a6e5cb459fb9866cf2e377b803501152ab7ce69..f193c2778d0f04973546256d648692398b932dca 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3474,6 +3474,23 @@ public abstract class EntityLiving extends Entity { @@ -3474,6 +3474,23 @@ public abstract class EntityLiving extends Entity {

2
Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch → Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch
View File

@ -17,7 +17,7 @@ index 73a33eff97d26e5b3542d787344013e18e52db68..6a46b9262ba34febc2664a6f56c18684
return (float) (1.0D / this.b(GenericAttributes.ATTACK_SPEED) * 20.0D); return (float) (1.0D / this.b(GenericAttributes.ATTACK_SPEED) * 20.0D);
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8092fba753f08b31edfd457960b8edc3578fb3ca..7976d943855e444746b9e6efca57bfefe28bb0b1 100644 index 18f0d23e38abb9c3e326a727cc4b4e040adb432d..982b8a7028385d38ff0bd88aabd94801ae258037 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1993,6 +1993,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1993,6 +1993,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
Spigot-Server-Patches/0279-Improve-death-events.patch → Spigot-Server-Patches/0280-Improve-death-events.patch
View File

@ -274,7 +274,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9
return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F; return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
} }
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d4c907fb4914d3ffc3c361af08cfd709d3a88558..8da30fd037a91309b09a1ba55cc085364d292c1f 100644 index dd3ae707776626d54894d19d5b0968256104c4dd..08e2e911d726e9d306f5fcc7755ab89f94959aa3 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -84,6 +84,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -84,6 +84,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -352,7 +352,7 @@ index 9a2e6bedfc50fba10f37c01d825f80415bfb69d3..a4afe638515471159d505a5e402a9342
this.minecraftKey = minecraftKey; this.minecraftKey = minecraftKey;
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7976d943855e444746b9e6efca57bfefe28bb0b1..89553476d6dec092d04830c169b886d7868da3be 100644 index 982b8a7028385d38ff0bd88aabd94801ae258037..6c3b9df31e9c44f7171cf08014561e4b095133b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1784,7 +1784,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1784,7 +1784,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

0
Spigot-Server-Patches/0280-Allow-chests-to-be-placed-with-NBT-data.patch → Spigot-Server-Patches/0281-Allow-chests-to-be-placed-with-NBT-data.patch
View File

2
Spigot-Server-Patches/0281-Mob-Pathfinding-API.patch → Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch
View File

@ -153,7 +153,7 @@ index 0000000000000000000000000000000000000000..af1bac9680028130e99c5e7130f258c1
+ } + }
+} +}
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index ee7b1f25ba8b6b4318e332b739359db6ddd58b62..64b991859f0f3ca7d932b8acc8aeed401e22a388 100644 index d39ce9c1816aaa33478dcd623056488ca21411f3..81c88c6bf737945c6cbd659d2feaf3f763b7df73 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -79,7 +79,7 @@ public abstract class NavigationAbstract { @@ -79,7 +79,7 @@ public abstract class NavigationAbstract {

0
Spigot-Server-Patches/0282-Prevent-chunk-loading-from-Fluid-Flowing.patch → Spigot-Server-Patches/0283-Prevent-chunk-loading-from-Fluid-Flowing.patch
View File

0
Spigot-Server-Patches/0283-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch → Spigot-Server-Patches/0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
View File

0
Spigot-Server-Patches/0284-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch → Spigot-Server-Patches/0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
View File

0
Spigot-Server-Patches/0285-Prevent-mob-spawning-from-loading-generating-chunks.patch → Spigot-Server-Patches/0286-Prevent-mob-spawning-from-loading-generating-chunks.patch
View File

0
Spigot-Server-Patches/0286-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch → Spigot-Server-Patches/0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
View File

0
Spigot-Server-Patches/0287-Implement-furnace-cook-speed-multiplier-API.patch → Spigot-Server-Patches/0288-Implement-furnace-cook-speed-multiplier-API.patch
View File

0
Spigot-Server-Patches/0288-PreSpawnerSpawnEvent.patch → Spigot-Server-Patches/0289-PreSpawnerSpawnEvent.patch
View File

0
Spigot-Server-Patches/0289-Catch-JsonParseException-in-Entity-and-TE-names.patch → Spigot-Server-Patches/0290-Catch-JsonParseException-in-Entity-and-TE-names.patch
View File

2
Spigot-Server-Patches/0290-Honor-EntityAgeable.ageLock.patch → Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Honor EntityAgeable.ageLock
diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
index e56aabd8a59c29406ac0f8dfc2207526f6fa99aa..de48dc7cd1996f1a62ef1d0047b1182d7889bd38 100644 index 03f7979e34355842e405ec32c713ecc34c5a7a8b..026e75e5ae9e231e3f898823825adab30237d53d 100644
--- a/src/main/java/net/minecraft/server/EntityAgeable.java --- a/src/main/java/net/minecraft/server/EntityAgeable.java
+++ b/src/main/java/net/minecraft/server/EntityAgeable.java +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
@@ -73,6 +73,7 @@ public abstract class EntityAgeable extends EntityCreature { @@ -73,6 +73,7 @@ public abstract class EntityAgeable extends EntityCreature {

8
Spigot-Server-Patches/0291-Configurable-connection-throttle-kick-message.patch → Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 6a23438c11d4c758ef718e9575c548152052ff2f..c11b864b667f199f3d73db856399e47ec7e66d6c 100644 index aaaaead8c740a22906612ca43147bd00eb4639f7..9e10e2e965dd52755ee5ede71104cc89b11da45e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -273,6 +273,11 @@ public class PaperConfig { @@ -273,6 +273,11 @@ public class PaperConfig {
@ -17,9 +17,9 @@ index 6a23438c11d4c758ef718e9575c548152052ff2f..c11b864b667f199f3d73db856399e47e
+ connectionThrottleKickMessage = getString("messages.kick.connection-throttle", connectionThrottleKickMessage); + connectionThrottleKickMessage = getString("messages.kick.connection-throttle", connectionThrottleKickMessage);
+ } + }
+ +
public static boolean useAlternativeLuckFormula = false; public static boolean savePlayerData = true;
private static void useAlternativeLuckFormula() { private static void savePlayerData() {
useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false); savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index abace78271eedd453df692f4e24dacef474d215e..5e1747dc176ef855829a38605ec85c8494fb0d21 100644 index abace78271eedd453df692f4e24dacef474d215e..5e1747dc176ef855829a38605ec85c8494fb0d21 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java --- a/src/main/java/net/minecraft/server/HandshakeListener.java

0
Spigot-Server-Patches/0292-Hook-into-CB-plugin-rewrites.patch → Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch
View File

2
Spigot-Server-Patches/0293-Allow-setting-the-vex-s-summoner.patch → Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Allow setting the vex's summoner
diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
index b84eb0394ab9a53e32b774682bc42b067625195e..ed6a47ad2fd973695fbb151d1a44000ec3639e54 100644 index a8e9b1e83969f4e49465fc5e8b5fb8a5efe5f81d..ae05856f25b092d193ec709ac6971c1089482242 100644
--- a/src/main/java/net/minecraft/server/EntityVex.java --- a/src/main/java/net/minecraft/server/EntityVex.java
+++ b/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java
@@ -130,6 +130,7 @@ public class EntityVex extends EntityMonster { @@ -130,6 +130,7 @@ public class EntityVex extends EntityMonster {

0
Spigot-Server-Patches/0294-Add-sun-related-API.patch → Spigot-Server-Patches/0295-Add-sun-related-API.patch
View File

2
Spigot-Server-Patches/0295-Turtle-API.patch → Spigot-Server-Patches/0296-Turtle-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Turtle API
diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
index 19c92bea21ddcc3917eb011dcfe41006299356ef..fa8eab20bb839c53bf7989d02d2274f835002609 100644 index a3dcb72c600034886137c24b22e64c54980c33f3..2ce40da2a8e28e80b4cb2cb827f45ddd4601d93a 100644
--- a/src/main/java/net/minecraft/server/EntityTurtle.java --- a/src/main/java/net/minecraft/server/EntityTurtle.java
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -31,7 +31,7 @@ public class EntityTurtle extends EntityAnimal { @@ -31,7 +31,7 @@ public class EntityTurtle extends EntityAnimal {

0
Spigot-Server-Patches/0296-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch → Spigot-Server-Patches/0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
View File

0
Spigot-Server-Patches/0297-Call-player-spectator-target-events-and-improve-impl.patch → Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch
View File

4
Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch → Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch
View File

@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
login plugin message packet. login plugin message packet.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index c11b864b667f199f3d73db856399e47ec7e66d6c..81a83dd3efdccf55fab848ba2f00a4850f2e2b4d 100644 index 9e10e2e965dd52755ee5ede71104cc89b11da45e..7b905c16e3833741966cce301b0f7639addac05e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -8,6 +8,7 @@ import java.io.IOException; @@ -8,6 +8,7 @@ import java.io.IOException;
@ -34,7 +34,7 @@ index c11b864b667f199f3d73db856399e47ec7e66d6c..81a83dd3efdccf55fab848ba2f00a485
} }
public static int packetInSpamThreshold = 300; public static int packetInSpamThreshold = 300;
@@ -307,4 +308,21 @@ public class PaperConfig { @@ -316,4 +317,21 @@ public class PaperConfig {
} }
tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit); tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
} }

2
Spigot-Server-Patches/0299-Add-more-Witch-API.patch → Spigot-Server-Patches/0300-Add-more-Witch-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add more Witch API
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
index 0703124e5137ff0a5ae4d025488eb343d2813067..ca3c5150bcfe2a92b49ad5a27c23dd37a7054fbb 100644 index fc58cce8455dcf244355189fabb1a76114c19368..0ef981e5ad1c928fbcf32e83e28285e690df1775 100644
--- a/src/main/java/net/minecraft/server/EntityWitch.java --- a/src/main/java/net/minecraft/server/EntityWitch.java
+++ b/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -1,5 +1,11 @@ @@ -1,5 +1,11 @@

2
Spigot-Server-Patches/0300-Check-Drowned-for-Villager-Aggression-Config.patch → Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Check Drowned for Villager Aggression Config
diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
index 9c507cb0810029e3c5d7cb1055da170469315596..9ae0897bfd6a4577901d9189d0dba22f3ec2110c 100644 index 958bdb8ff25a1605ab7f99816bf80908b444a3fb..ea7934060d7b7c3ca1c7fdc303168377a59c21a3 100644
--- a/src/main/java/net/minecraft/server/EntityDrowned.java --- a/src/main/java/net/minecraft/server/EntityDrowned.java
+++ b/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
@@ -31,7 +31,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -31,7 +31,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {

Some files were not shown because too many files have changed in this diff Show More