Update to Minecraft 1.17

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/npc/MobSpawnerTrader.java
+++ b/net/minecraft/world/entity/npc/MobSpawnerTrader.java
@@ -104,7 +104,7 @@
@@ -111,7 +111,7 @@
return false;
}
@@ -9,16 +9,16 @@
if (entityvillagertrader != null) {
for (int i = 0; i < 2; ++i) {
@@ -112,7 +112,7 @@
@@ -119,7 +119,7 @@
}
this.b.a(entityvillagertrader.getUniqueID());
this.serverLevelData.a(entityvillagertrader.getUniqueID());
- entityvillagertrader.setDespawnDelay(48000);
+ // entityvillagertrader.setDespawnDelay(48000); // CraftBukkit - moved to EntityVillagerTrader constructor. This lets the value be modified by plugins on CreatureSpawnEvent
entityvillagertrader.g(blockposition1);
entityvillagertrader.a(blockposition1, 16);
return true;
@@ -127,7 +127,7 @@
@@ -134,7 +134,7 @@
BlockPosition blockposition = this.a((IWorldReader) worldserver, entityvillagertrader.getChunkCoordinates(), i);
if (blockposition != null) {