Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f7e3976 Revert "Legacy data should look for legacy materials (Fixes #6618)" (Fixes #6664)
PaperMC/Paper@ce1e7e8 Fix jline relocation (#6677)
PaperMC/Paper@3e8fb21 Suggest PlayerPostRespawnEvent if changing player state (#6679)
PaperMC/Paper@2b404b0 Fix nullability on Block#breakNaturally (#6651)
PaperMC/Paper@8ee9bdd Fix stacktrace deobf where thrownProxy got initialized before rewriting (#6684)
PaperMC/Paper@fce7905 Option to prevent NBT copy in smithing recipes (#6671)
PaperMC/Paper@3b2b835 Fix click event when vanilla scoreboard name coloring is enabled (#6652)
PaperMC/Paper@425edfa More CommandBlock API (#5746)
PaperMC/Paper@6847f57 Improve ItemStack#editMeta (#6502)
PaperMC/Paper@6703c13 Preserve overstacked loot (#5943)
PaperMC/Paper@0032236 Make Levels Use Correct Spawn Settings (#6419)
PaperMC/Paper@4a27a4a Update head rotation in missing places (#5481)
PaperMC/Paper@ebfd70b Use null for null resource pack prompts (#6572)
PaperMC/Paper@826acaf Fix plugin provides load order (#6687)
PaperMC/Paper@f905057 Prevent unintended light block manipulation (#6601)
PaperMC/Paper@45c4f90 Readd root/admin user detection (#6593)
PaperMC/Paper@e8830b2 Revert "Readd root/admin user detection (#6593)" (#6699)
PaperMC/Paper@cc38c16 Updated Upstream (Bukkit/CraftBukkit) (#6638)
PaperMC/Paper@7dd7c0c [ci skip] update issue template to remove checkboxes and add datapacks (#6702)
PaperMC/Paper@bde7b98 Make legacyRenderer a ViewerUnaware renderer (#6691)
PaperMC/Paper@e391591 Update paperweight to 1.1.12 (#6653)
PaperMC/Paper@e14aff9 Don't count named piglins and hoglins towards mob cap (#6452)
PaperMC/Paper@a978f41 Start console thread after PaperConfig & MinecraftServer.console are initialized (#6716)
PaperMC/Paper@b1f0cbd [ci skip] Remove redundant/broken readme badges (#6715)
PaperMC/Paper@e3ef498 [ci skip] remove markdown from issue template (#6705)
PaperMC/Paper@7ebf08a Handle missing Spawn Egg item meta for 1.17 mobs (#6700)
PaperMC/Paper@90f717f Add missing team sidebar display slots (#6690)
  • Loading branch information
@encode42
encode42 committed Oct 4, 2021
1 parent 144a08e commit c783c42
Show file tree
Hide file tree
Showing 34 changed files with 220 additions and 220 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
@@ -1,7 +1,7 @@
plugins {
java
id("com.github.johnrengelman.shadow") version "7.0.0" apply false
id("io.papermc.paperweight.patcher") version "1.1.11"
id("io.papermc.paperweight.patcher") version "1.1.12"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Expand Up @@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
mcVersion = 1.17.1
packageVersion = 1_17_R1

paperCommit = 3e3cea1a76247d518ee54d00ed9b727ea106aff3
paperCommit = 90f717fa5a6b375b9c46a3a56fdbdb026aabdad8

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
4 changes: 2 additions & 2 deletions patches/api/0021-ItemStack-convenience-methods.patch
View file
Expand Up @@ -50,7 +50,7 @@ index ed6dfb28f8f434680fc8eacbe49a9d0b6cf9be83..a128b647367487f6ba597d9a34378085
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 59a026d80b0a0a4890becf98efdbe5325b2c622a..ff9815e10cef89e98fb6d0181ac1eee0cc24d296 100644
index 56072cb4d32ca8a09023be08a5a832c2c108379a..401080c53a0f69dcdfb920dbf0c5a07e249f6338 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
Expand All @@ -72,7 +72,7 @@ index 59a026d80b0a0a4890becf98efdbe5325b2c622a..ff9815e10cef89e98fb6d0181ac1eee0

/**
* Represents a stack of items.
@@ -935,4 +947,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
@@ -954,4 +966,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
return Bukkit.getUnsafe().isValidRepairItemStack(toBeRepaired, this);
}
// Paper end
Expand Down
6 changes: 3 additions & 3 deletions patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch
View file
Expand Up @@ -616,7 +616,7 @@ index d1757f3d456ff9efce26ce8baa1d16d896908cc2..a5db52386e11e4b5511ae417a0e7ac92
TASK(ChatColor.GREEN),
CHALLENGE(ChatColor.DARK_PURPLE),
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index ad8bce01ba459a036cd4ebbbe4fc974021924fe2..466de59ee63a065151f62029743598f1e8d54253 100644
index 0006a5a53dfa9fc81c608423e8740a9c820659a3..1eac84f8abf71029e9e0626a9fa93446f9d0df02 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -184,6 +184,9 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
Expand Down Expand Up @@ -1056,7 +1056,7 @@ index ceb3e2c5117740ce284e893fff8e41a002d78649..fab5c3c90f55c113cae2bca2354a94e8

/**
diff --git a/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java b/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
index 91cab8b13d5bba34007f124838b32a1df58c5ac7..078228106b299a8e38495f7f881d38de4f87bc95 100644
index 6a6021ad3a0e6aaf51f5144fa126e81bada9cfcf..5dbbb8767fa78c1ae4323e5e1e92f153571e3f3b 100644
--- a/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
+++ b/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
@@ -4,6 +4,9 @@ import org.bukkit.entity.Minecart;
Expand All @@ -1066,7 +1066,7 @@ index 91cab8b13d5bba34007f124838b32a1df58c5ac7..078228106b299a8e38495f7f881d38de
+/**
+ * Represents a minecart with command block
+ */
public interface CommandMinecart extends Minecart {
public interface CommandMinecart extends Minecart, io.papermc.paper.command.CommandBlockHolder { // Paper

/**
diff --git a/src/main/java/org/bukkit/event/Cancellable.java b/src/main/java/org/bukkit/event/Cancellable.java
Expand Down
4 changes: 2 additions & 2 deletions patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch
View file
Expand Up @@ -291,10 +291,10 @@ index 9bbb69ebd6035464da0a5ce8c742054224b53bfc..c1670adf70a2edcd7ceed1aed7dc223d

// Paper start
diff --git a/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java b/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
index 078228106b299a8e38495f7f881d38de4f87bc95..bd5b3142a88c31a676c08fa3e8175f81f4259835 100644
index 5dbbb8767fa78c1ae4323e5e1e92f153571e3f3b..53ec0f32767bd808482ee05fc5d6e1f9480eac9d 100644
--- a/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
+++ b/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
@@ -37,7 +37,7 @@ public interface CommandMinecart extends Minecart {
@@ -37,7 +37,7 @@ public interface CommandMinecart extends Minecart, io.papermc.paper.command.Comm
* @param name New name for this CommandMinecart.
* @deprecated in favour of {@link #customName(net.kyori.adventure.text.Component)}
*/
Expand Down
48 changes: 24 additions & 24 deletions patches/server/0001-Airplane-Server-Changes.patch
View file
Expand Up @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

diff --git a/build.gradle.kts b/build.gradle.kts
index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..c1e70d5f127804deabcf626b725390863e896d38 100644
index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ae0be22d1ad7a37e8f7f0b11a15d78559af72cbc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,9 +2,12 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCach
Expand Down Expand Up @@ -1671,7 +1671,7 @@ index 505546d32eea4682452dbac02311433157f6a30e..5c7b9ad379f3c272e15648dd16f4df92

public static <V> CompletableFuture<List<V>> sequenceFailFast(List<? extends CompletableFuture<? extends V>> futures) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1d7c26354eee1dff5e66b6234d408ed8f800415c..f6d335b377dbf6f744e5f6ced56cf437e6e6bab3 100644
index fe6d5051b139cd6079e288ffdf20e30fdd46fdda..26b6bc83e9f6b07878ef454067618c4884d5b54b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Expand All @@ -1692,10 +1692,10 @@ index 1d7c26354eee1dff5e66b6234d408ed8f800415c..f6d335b377dbf6f744e5f6ced56cf437
}

diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 1bf19965d12514dee34545235bfbadc0b74ddc8b..2a569d05edf0f5337afbcd6803c0513d338ca55e 100644
index 7ce1ce59eeba8b57cd76b1c9c561733b476e7ebf..291e96aac85e86e1f5d2c295adb1b9e05b2f2528 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -223,6 +223,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -224,6 +224,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
Expand All @@ -1705,7 +1705,7 @@ index 1bf19965d12514dee34545235bfbadc0b74ddc8b..2a569d05edf0f5337afbcd6803c0513d
this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 4045b7999948710517259edf1cda7028a96cc4c9..961787473601fcddef98f321eb4fb5127c0f8ebc 100644
index b3c99c1678c3ee159861c8aac38e765d664c4d1d..fc63a0e475c90063cd8308299f7d361f3a47d484 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2402,8 +2402,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
Expand Down Expand Up @@ -1949,7 +1949,7 @@ index 7437f01ca8f416e2c9150250e324af4725a4efb6..bdcd0e38a3ba904811112f41d8bfbfc0
int LARGE_MAX_STACK_SIZE = 64;

diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 94857a736d2a16e8ade286c6f2ddf8bd798008eb..5d455a662107182659abcbe83195ac5d6cf25813 100644
index 4f164f238177b5e2b18c76b7cc14596ec93409d1..2856de51e1f12ea2d5a04dabbb212ca302156aa6 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -338,6 +338,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
Expand Down Expand Up @@ -2011,7 +2011,7 @@ index 94857a736d2a16e8ade286c6f2ddf8bd798008eb..5d455a662107182659abcbe83195ac5d

return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
}
@@ -2439,9 +2465,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2441,9 +2467,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

// Paper start
return io.papermc.paper.util.CollisionUtil.getCollisionsForBlocksOrWorldBorder(this.level, this, axisalignedbb, null,
Expand All @@ -2022,7 +2022,7 @@ index 94857a736d2a16e8ade286c6f2ddf8bd798008eb..5d455a662107182659abcbe83195ac5d
// Paper end
}
}
@@ -3813,12 +3837,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3815,12 +3839,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
return false;
} else {
AABB axisalignedbb = this.getBoundingBox().deflate(0.001D);
Expand All @@ -2043,7 +2043,7 @@ index 94857a736d2a16e8ade286c6f2ddf8bd798008eb..5d455a662107182659abcbe83195ac5d
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -3826,14 +3852,62 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3828,14 +3854,62 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();

Expand Down Expand Up @@ -2112,7 +2112,7 @@ index 94857a736d2a16e8ade286c6f2ddf8bd798008eb..5d455a662107182659abcbe83195ac5d

if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -3850,9 +3924,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3852,9 +3926,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
}
}
}
Expand All @@ -2138,7 +2138,7 @@ index 1c446dba5de89698397041ee38a2e1a00bec8a56..03371c99c34ba4b2ffde3f6da36f171b
public final String id;

diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 1149a15486016ac101c5976b45b7d1c1109244ce..8347b13e515e306253ca2a1f79001e1aced30c2a 100644
index 1018f4640bab5876c5e0afb5b88f71437fb79662..5905f02cb695ca619ebcd13cad2fc6dff564f5d9 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
Expand All @@ -2149,7 +2149,7 @@ index 1149a15486016ac101c5976b45b7d1c1109244ce..8347b13e515e306253ca2a1f79001e1a

public abstract class LivingEntity extends Entity {

@@ -1829,6 +1828,20 @@ public abstract class LivingEntity extends Entity {
@@ -1828,6 +1827,20 @@ public abstract class LivingEntity extends Entity {
return this.lastClimbablePos;
}

Expand All @@ -2170,7 +2170,7 @@ index 1149a15486016ac101c5976b45b7d1c1109244ce..8347b13e515e306253ca2a1f79001e1a
public boolean onClimbable() {
if (this.isSpectator()) {
return false;
@@ -3433,7 +3446,10 @@ public abstract class LivingEntity extends Entity {
@@ -3432,7 +3445,10 @@ public abstract class LivingEntity extends Entity {
Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());

// Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
Expand Down Expand Up @@ -2368,7 +2368,7 @@ index 3ee691d4caccbc1b3e0f52decb41d436ac0d08ec..8a0aea6b28295e03aaac1768336b1bc3
return false;
}
diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
index 153194d937d210e2e4fd8864e4a3c000f85d7e2e..1d415a91b9c90603e8f738dbafe7a5ea57ef14cc 100644
index 9ed2f8f2843c634fd14dda4459f85b7140dd447a..cda441f5cf64f061dc145fbeba175874c31cebe4 100644
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -254,13 +254,22 @@ public class Bat extends AmbientCreature {
Expand Down Expand Up @@ -2396,7 +2396,7 @@ index 153194d937d210e2e4fd8864e4a3c000f85d7e2e..1d415a91b9c90603e8f738dbafe7a5ea
@Override
protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index 0c616bd9309d304727a29ff5cb1c60d9f031b34c..b67562ea0ba8dc5c3fb26b3e79b89e0b3fd69631 100644
index 2b8725087fd3bfeca7162bda2783fdacd13a8390..16adf07774d568852b289ae8507779dd78110fc3 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -275,9 +275,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
Expand All @@ -2412,7 +2412,7 @@ index 0c616bd9309d304727a29ff5cb1c60d9f031b34c..b67562ea0ba8dc5c3fb26b3e79b89e0b
this.level.getProfiler().pop();
this.level.getProfiler().push("axolotlActivityUpdate");
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index 15787afad42f9299638a1c9e57d26678805f18ee..0d220ea2d2651c46ba60c68bdd8dad3182c69740 100644
index 32d0387b6c66462ca965add78a562dec3c4b95a9..82a363c5141cd00eec9b7e03e7ac6522b9b3c527 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -144,9 +144,11 @@ public class Goat extends Animal {
Expand Down Expand Up @@ -2449,7 +2449,7 @@ index 063f3e4c67e6716c9a03dbe4b72eafd32e4f0d53..dae6f7a05426ea31d13c82458b33e20a
// Paper End
this.tryToMerge(entityitem);
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index e1e220b3e4967590a2a77370e2a6ab919ad50eaa..5d371a3e94720e24058d007474355af6aeb7cbdd 100644
index b27e2e1e2270a7a2f3e36b90a19237e39e4175b8..e5068464d66641b4ae96aecee8d1216ae2dc37c1 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -312,11 +312,17 @@ public class EnderMan extends Monster implements NeutralMob {
Expand All @@ -2473,7 +2473,7 @@ index e1e220b3e4967590a2a77370e2a6ab919ad50eaa..5d371a3e94720e24058d007474355af6
boolean flag1 = iblockdata.getFluidState().is((Tag) FluidTags.WATER);

diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index c510da19883d1aa79b2fc25e2d9c8f5cd8dd7bfa..3f6697d21cf32b83d3dcd74d810effc28c9efc95 100644
index c5b9c0c650df5f4b7e3d2a431dc900e210104dea..4c111bc335ab8cafe6674b77dcd7a22cb1c58ae9 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -123,12 +123,14 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
Expand All @@ -2493,7 +2493,7 @@ index c510da19883d1aa79b2fc25e2d9c8f5cd8dd7bfa..3f6697d21cf32b83d3dcd74d810effc2
this.level.getProfiler().pop();
HoglinAi.updateActivity(this);
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
index c7ad0e317c0c74e5ad3e08278c5e7b31c894413e..06c6ed64488bb3685b9de3e05d8a1e74ebc62e37 100644
index 37712fe8585ede00569026bba5377ab61ad08ff5..758558c1e312edc730d1f5d7ffdbc5a41356a6e5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -289,9 +289,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
Expand All @@ -2509,7 +2509,7 @@ index c7ad0e317c0c74e5ad3e08278c5e7b31c894413e..06c6ed64488bb3685b9de3e05d8a1e74
this.level.getProfiler().pop();
PiglinAi.updateActivity(this);
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index eaefa4f5f86f1c836aa29dd64ea786baced4b34d..0f7f7aef78a1f34fe113eeb00a88fd2610351344 100644
index b746453774054dd2db023b7eea265a395cfc7cc9..4904971710acbb2855ed9ed96fead4aed189c494 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -142,6 +142,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
Expand Down Expand Up @@ -2919,7 +2919,7 @@ index b93056b91e7ebd49e6ddb53ccb6c05c056088df9..6f4e6105aa1d6546daa2424f57972fd2
}

diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 0b228b8bcae5ed2840ab244b6de35732f737504d..d2a282d9c84952627a0ae1a4b1ff388e39c472c3 100644
index f316585ccf6baf5e7e514ba3a68b4344e781a82d..7db5d3e7eef3dfed51895d72c0cb2b1e8c286d5f 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -415,12 +415,12 @@ public final class NaturalSpawner {
Expand Down Expand Up @@ -3589,10 +3589,10 @@ index fcb7bd9f3b6b6ada0f2e5692bce32ab76b8798a7..61c2096f2c034dbc3ad33b193b058c7d
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c1fc309411c277f7b7450686543a6a7a7fe2fdb1..28fa8e5c0d1e78d57d9cfb5ea2998740b8d700dc 100644
index f925130552cb4ff2f813b1ddae9ac2f915e17bd5..978c52b6ab260c3392d16143778b1cfc6404920f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper

public final class CraftServer implements Server {
Expand All @@ -3601,7 +3601,7 @@ index c1fc309411c277f7b7450686543a6a7a7fe2fdb1..28fa8e5c0d1e78d57d9cfb5ea2998740
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -997,6 +997,11 @@ public final class CraftServer implements Server {
@@ -1000,6 +1000,11 @@ public final class CraftServer implements Server {
plugin.getDescription().getName(),
"This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
));
Expand Down

0 comments on commit c783c42

Please sign in to comment.