SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.20

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-06-08 01:30:00 +10:00
parent bac55e67d6
commit 9d740b84b0
269 changed files with 2605 additions and 2568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/level/WorldServer.java
+++ b/net/minecraft/server/level/WorldServer.java
@@ -159,6 +159,26 @@
@@ -162,6 +162,26 @@
import net.minecraft.world.ticks.TickListServer;
import org.slf4j.Logger;
@@ -27,7 +27,7 @@
public class WorldServer extends World implements GeneratorAccessSeed {
public static final BlockPosition END_SPAWN_POINT = new BlockPosition(100, 50, 0);
@@ -172,7 +192,7 @@
@@ -175,7 +195,7 @@
final List<EntityPlayer> players;
private final ChunkProviderServer chunkSource;
private final MinecraftServer server;
@@ -36,11 +36,11 @@
final EntityTickList entityTickList;
public final PersistentEntitySectionManager<Entity> entityManager;
private final GameEventDispatcher gameEventDispatcher;
@@ -196,12 +216,30 @@
private final StructureCheck structureCheck;
@@ -200,12 +220,30 @@
private final boolean tickTime;
private final RandomSequences randomSequences;
- public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List<MobSpawner> list, boolean flag1) {
- public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List<MobSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences) {
- IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess();
- Holder holder = worlddimension.type();
+ // CraftBukkit start
@@ -59,7 +59,7 @@
- Objects.requireNonNull(minecraftserver);
- super(iworlddataserver, resourcekey, iregistrycustom_dimension, holder, minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates());
+ // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
+ public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, WorldDataServer iworlddataserver, ResourceKey<World> resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List<MobSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
+ public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, WorldDataServer iworlddataserver, ResourceKey<World> resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List<MobSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
+ // IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess(); // CraftBukkit - decompile error
+ // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
+
@@ -72,7 +72,7 @@
this.players = Lists.newArrayList();
this.entityTickList = new EntityTickList();
this.blockTicks = new TickListServer<>(this::isPositionTickingWithEntitiesLoaded, this.getProfilerSupplier());
@@ -215,6 +253,22 @@
@@ -219,6 +257,22 @@
this.customSpawners = list;
this.serverLevelData = iworlddataserver;
ChunkGenerator chunkgenerator = worlddimension.generator();
@@ -95,7 +95,7 @@
boolean flag2 = minecraftserver.forceSynchronousWrites();
DataFixer datafixer = minecraftserver.getFixerUpper();
EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(this, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, minecraftserver);
@@ -246,15 +300,16 @@
@@ -250,9 +304,9 @@
long l = minecraftserver.getWorldData().worldGenOptions().seed();
this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), resourcekey, chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer);
@@ -108,14 +108,15 @@
} else {
this.dragonFight = null;
}
this.sleepStatus = new SleepStatus();
this.gameEventDispatcher = new GameEventDispatcher(this);
@@ -266,6 +320,7 @@
return new RandomSequences(l);
}, "random_sequences");
});
+ this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
}
public void setWeatherParameters(int i, int j, boolean flag, boolean flag1) {
@@ -286,12 +341,20 @@
/** @deprecated */
@@ -304,12 +359,20 @@
long j;
if (this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) {
@@ -139,7 +140,7 @@
if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE) && this.isRaining()) {
this.resetWeatherCycle();
}
@@ -317,7 +380,7 @@
@@ -335,7 +398,7 @@
this.runBlockEvents();
this.handlingTick = false;
gameprofilerfiller.pop();
@@ -148,7 +149,7 @@
if (flag) {
this.resetEmptyTime();
@@ -333,7 +396,7 @@
@@ -351,7 +414,7 @@
this.entityTickList.forEach((entity) -> {
if (!entity.isRemoved()) {
@@ -157,7 +158,7 @@
entity.discard();
} else {
gameprofilerfiller.push("checkDespawn");
@@ -405,7 +468,7 @@
@@ -423,7 +486,7 @@
private void wakeUpAllPlayers() {
this.sleepStatus.removeAllSleepers();
@@ -166,7 +167,7 @@
entityplayer.stopSleepInBed(false, false);
});
}
@@ -433,7 +496,7 @@
@@ -451,7 +514,7 @@
entityhorseskeleton.setTrap(true);
entityhorseskeleton.setAge(0);
entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
@@ -175,7 +176,7 @@
}
}
@@ -442,7 +505,7 @@
@@ -460,7 +523,7 @@
if (entitylightning != null) {
entitylightning.moveTo(Vec3D.atBottomCenterOf(blockposition));
entitylightning.setVisualOnly(flag1);
@@ -184,7 +185,7 @@
}
}
}
@@ -456,7 +519,7 @@
@@ -475,7 +538,7 @@
BiomeBase biomebase = (BiomeBase) this.getBiome(blockposition).value();
if (biomebase.shouldFreeze(this, blockposition1)) {
@@ -193,8 +194,8 @@
}
if (flag) {
@@ -471,10 +534,10 @@
IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockSnow.LAYERS, l + 1);
@@ -489,10 +552,10 @@
IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockSnow.LAYERS, i1 + 1);
Block.pushEntitiesUp(iblockdata, iblockdata1, this, blockposition);
- this.setBlockAndUpdate(blockposition, iblockdata1);
@@ -206,7 +207,7 @@
}
}
@@ -670,6 +733,7 @@
@@ -688,6 +751,7 @@
this.rainLevel = MathHelper.clamp(this.rainLevel, 0.0F, 1.0F);
}
@@ -214,13 +215,13 @@
if (this.oRainLevel != this.rainLevel) {
this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel), this.dimension());
}
@@ -688,14 +752,47 @@
@@ -706,14 +770,47 @@
this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel));
this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, this.thunderLevel));
}
+ // */
+ for (int idx = 0; idx < this.players.size(); ++idx) {
+ if (((EntityPlayer) this.players.get(idx)).level == this) {
+ if (((EntityPlayer) this.players.get(idx)).level() == this) {
+ ((EntityPlayer) this.players.get(idx)).tickWeather();
+ }
+ }
@@ -228,13 +229,13 @@
+ if (flag != this.isRaining()) {
+ // Only send weather packets to those affected
+ for (int idx = 0; idx < this.players.size(); ++idx) {
+ if (((EntityPlayer) this.players.get(idx)).level == this) {
+ if (((EntityPlayer) this.players.get(idx)).level() == this) {
+ ((EntityPlayer) this.players.get(idx)).setPlayerWeather((!flag ? WeatherType.DOWNFALL : WeatherType.CLEAR), false);
+ }
+ }
+ }
+ for (int idx = 0; idx < this.players.size(); ++idx) {
+ if (((EntityPlayer) this.players.get(idx)).level == this) {
+ if (((EntityPlayer) this.players.get(idx)).level() == this) {
+ ((EntityPlayer) this.players.get(idx)).updateWeather(this.oRainLevel, this.rainLevel, this.oThunderLevel, this.thunderLevel);
+ }
+ }
@@ -264,7 +265,7 @@
}
public void resetEmptyTime() {
@@ -730,6 +827,7 @@
@@ -748,6 +845,7 @@
});
gameprofilerfiller.incrementCounter("tickNonPassenger");
entity.tick();
@@ -272,7 +273,7 @@
this.getProfiler().pop();
Iterator iterator = entity.getPassengers().iterator();
@@ -753,6 +851,7 @@
@@ -771,6 +869,7 @@
});
gameprofilerfiller.incrementCounter("tickPassenger");
entity1.rideTick();
@@ -280,7 +281,7 @@
gameprofilerfiller.pop();
Iterator iterator = entity1.getPassengers().iterator();
@@ -777,6 +876,7 @@
@@ -795,6 +894,7 @@
ChunkProviderServer chunkproviderserver = this.getChunkSource();
if (!flag1) {
@@ -288,7 +289,7 @@
if (iprogressupdate != null) {
iprogressupdate.progressStartNoAbort(IChatBaseComponent.translatable("menu.savingLevel"));
}
@@ -794,11 +894,19 @@
@@ -812,11 +912,19 @@
}
}
@@ -309,7 +310,7 @@
}
this.getChunkSource().getDataStorage().save();
@@ -863,15 +971,37 @@
@@ -881,15 +989,37 @@
@Override
public boolean addFreshEntity(Entity entity) {
@@ -350,7 +351,7 @@
}
public void addDuringCommandTeleport(EntityPlayer entityplayer) {
@@ -902,24 +1032,37 @@
@@ -920,24 +1050,37 @@
this.entityManager.addNewEntity(entityplayer);
}
@@ -392,7 +393,7 @@
return true;
}
}
@@ -933,10 +1076,32 @@
@@ -951,10 +1094,32 @@
entityplayer.remove(entity_removalreason);
}
@@ -425,7 +426,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -945,6 +1110,12 @@
@@ -963,6 +1128,12 @@
double d1 = (double) blockposition.getY() - entityplayer.getY();
double d2 = (double) blockposition.getZ() - entityplayer.getZ();
@@ -438,7 +439,7 @@
if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
entityplayer.connection.send(new PacketPlayOutBlockBreakAnimation(i, blockposition, j));
}
@@ -1004,7 +1175,18 @@
@@ -1022,7 +1193,18 @@
Iterator iterator = this.navigatingMobs.iterator();
while (iterator.hasNext()) {
@@ -458,7 +459,7 @@
NavigationAbstract navigationabstract = entityinsentient.getNavigation();
if (navigationabstract.shouldRecomputePath(blockposition)) {
@@ -1066,6 +1248,11 @@
@@ -1084,6 +1266,11 @@
@Override
public Explosion explode(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, World.a world_a) {
Explosion explosion = this.explode(entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, world_a, false);
@@ -470,7 +471,7 @@
if (!explosion.interactsWithBlocks()) {
explosion.clearToBlow();
@@ -1138,13 +1325,20 @@
@@ -1156,13 +1343,20 @@
}
public <T extends ParticleParam> int sendParticles(T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) {
@@ -493,7 +494,7 @@
++j;
}
}
@@ -1195,7 +1389,7 @@
@@ -1213,7 +1407,7 @@
@Nullable
public BlockPosition findNearestMapStructure(TagKey<Structure> tagkey, BlockPosition blockposition, int i, boolean flag) {
@@ -502,7 +503,7 @@
return null;
} else {
Optional<HolderSet.Named<Structure>> optional = this.registryAccess().registryOrThrow(Registries.STRUCTURE).getTag(tagkey);
@@ -1232,11 +1426,21 @@
@@ -1250,11 +1444,21 @@
@Nullable
@Override
public WorldMap getMapData(String s) {
@@ -525,7 +526,7 @@
this.getServer().overworld().getDataStorage().set(s, worldmap);
}
@@ -1534,6 +1738,11 @@
@@ -1552,6 +1756,11 @@
@Override
public void blockUpdated(BlockPosition blockposition, Block block) {
if (!this.isDebug()) {
@@ -537,7 +538,7 @@
this.updateNeighborsAt(blockposition, block);
}
@@ -1553,12 +1762,12 @@
@@ -1571,12 +1780,12 @@
}
public boolean isFlat() {
@@ -552,7 +553,7 @@
}
@Nullable
@@ -1581,7 +1790,7 @@
@@ -1599,7 +1808,7 @@
private static <T> String getTypeCount(Iterable<T> iterable, Function<T, String> function) {
try {
Object2IntOpenHashMap<String> object2intopenhashmap = new Object2IntOpenHashMap();
@@ -561,7 +562,7 @@
while (iterator.hasNext()) {
T t0 = iterator.next();
@@ -1590,7 +1799,7 @@
@@ -1608,7 +1817,7 @@
object2intopenhashmap.addTo(s, 1);
}
@@ -570,7 +571,7 @@
String s1 = (String) entry.getKey();
return s1 + ":" + entry.getIntValue();
@@ -1601,17 +1810,33 @@
@@ -1619,17 +1828,33 @@
}
public static void makeObsidianPlatform(WorldServer worldserver) {
@@ -606,7 +607,7 @@
}
@Override
@@ -1727,6 +1952,7 @@
@@ -1753,6 +1978,7 @@
}
entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
@@ -614,7 +615,7 @@
}
public void onTrackingEnd(Entity entity) {
@@ -1763,6 +1989,14 @@
@@ -1789,6 +2015,14 @@
}
entity.updateDynamicGameEventListener(DynamicGameEventListener::remove);