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

Update to Minecraft 1.19.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2022-07-28 04:00:00 +10:00
parent 7c33b52741
commit f8db65033c
41 changed files with 654 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
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
@@ -152,6 +152,26 @@
@@ -153,6 +153,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);
@@ -169,7 +189,7 @@
@@ -170,7 +190,7 @@
final List<EntityPlayer> players;
private final ChunkProviderServer chunkSource;
private final MinecraftServer server;
@@ -36,7 +36,7 @@
final EntityTickList entityTickList;
public final PersistentEntitySectionManager<Entity> entityManager;
public boolean noSave;
@@ -193,11 +213,28 @@
@@ -194,11 +214,28 @@
private final StructureCheck structureCheck;
private final boolean tickTime;
@@ -69,7 +69,7 @@
this.players = Lists.newArrayList();
this.entityTickList = new EntityTickList();
this.blockTicks = new TickListServer<>(this::isPositionTickingWithEntitiesLoaded, this.getProfilerSupplier());
@@ -212,6 +249,22 @@
@@ -213,6 +250,22 @@
this.customSpawners = list;
this.serverLevelData = iworlddataserver;
ChunkGenerator chunkgenerator = worlddimension.generator();
@@ -92,7 +92,7 @@
boolean flag2 = minecraftserver.forceSynchronousWrites();
DataFixer datafixer = minecraftserver.getFixerUpper();
EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(this, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, minecraftserver);
@@ -243,14 +296,15 @@
@@ -244,14 +297,15 @@
long l = minecraftserver.getWorldData().worldGenSettings().seed();
this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), resourcekey, chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer);
@@ -111,7 +111,7 @@
}
public void setWeatherParameters(int i, int j, boolean flag, boolean flag1) {
@@ -282,12 +336,20 @@
@@ -283,12 +337,20 @@
long j;
if (this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) {
@@ -135,7 +135,7 @@
if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE) && this.isRaining()) {
this.resetWeatherCycle();
}
@@ -313,7 +375,7 @@
@@ -314,7 +376,7 @@
this.runBlockEvents();
this.handlingTick = false;
gameprofilerfiller.pop();
@@ -144,7 +144,7 @@
if (flag) {
this.resetEmptyTime();
@@ -329,7 +391,7 @@
@@ -330,7 +392,7 @@
this.entityTickList.forEach((entity) -> {
if (!entity.isRemoved()) {
@@ -153,7 +153,7 @@
entity.discard();
} else {
gameprofilerfiller.push("checkDespawn");
@@ -403,7 +465,7 @@
@@ -404,7 +466,7 @@
private void wakeUpAllPlayers() {
this.sleepStatus.removeAllSleepers();
@@ -162,7 +162,7 @@
entityplayer.stopSleepInBed(false, false);
});
}
@@ -430,14 +492,14 @@
@@ -431,14 +493,14 @@
entityhorseskeleton.setTrap(true);
entityhorseskeleton.setAge(0);
entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
@@ -179,7 +179,7 @@
}
}
@@ -448,12 +510,12 @@
@@ -449,12 +511,12 @@
BiomeBase biomebase = (BiomeBase) this.getBiome(blockposition).value();
if (biomebase.shouldFreeze(this, blockposition1)) {
@@ -194,7 +194,7 @@
}
IBlockData iblockdata = this.getBlockState(blockposition1);
@@ -649,6 +711,7 @@
@@ -650,6 +712,7 @@
this.rainLevel = MathHelper.clamp(this.rainLevel, 0.0F, 1.0F);
}
@@ -202,7 +202,7 @@
if (this.oRainLevel != this.rainLevel) {
this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel), this.dimension());
}
@@ -667,14 +730,47 @@
@@ -668,14 +731,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));
}
@@ -252,7 +252,7 @@
}
public void resetEmptyTime() {
@@ -709,6 +805,7 @@
@@ -710,6 +806,7 @@
});
gameprofilerfiller.incrementCounter("tickNonPassenger");
entity.tick();
@@ -260,7 +260,7 @@
this.getProfiler().pop();
Iterator iterator = entity.getPassengers().iterator();
@@ -732,6 +829,7 @@
@@ -733,6 +830,7 @@
});
gameprofilerfiller.incrementCounter("tickPassenger");
entity1.rideTick();
@@ -268,7 +268,7 @@
gameprofilerfiller.pop();
Iterator iterator = entity1.getPassengers().iterator();
@@ -756,6 +854,7 @@
@@ -757,6 +855,7 @@
ChunkProviderServer chunkproviderserver = this.getChunkSource();
if (!flag1) {
@@ -276,7 +276,7 @@
if (iprogressupdate != null) {
iprogressupdate.progressStartNoAbort(IChatBaseComponent.translatable("menu.savingLevel"));
}
@@ -773,11 +872,19 @@
@@ -774,11 +873,19 @@
}
}
@@ -297,7 +297,7 @@
}
this.getChunkSource().getDataStorage().save();
@@ -823,15 +930,37 @@
@@ -824,15 +931,37 @@
@Override
public boolean addFreshEntity(Entity entity) {
@@ -338,7 +338,7 @@
}
public void addDuringCommandTeleport(EntityPlayer entityplayer) {
@@ -862,24 +991,37 @@
@@ -863,24 +992,37 @@
this.entityManager.addNewEntity(entityplayer);
}
@@ -380,7 +380,7 @@
return true;
}
}
@@ -893,10 +1035,32 @@
@@ -894,10 +1036,32 @@
entityplayer.remove(entity_removalreason);
}
@@ -413,7 +413,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -905,6 +1069,12 @@
@@ -906,6 +1070,12 @@
double d1 = (double) blockposition.getY() - entityplayer.getY();
double d2 = (double) blockposition.getZ() - entityplayer.getZ();
@@ -426,7 +426,7 @@
if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
entityplayer.connection.send(new PacketPlayOutBlockBreakAnimation(i, blockposition, j));
}
@@ -941,6 +1111,14 @@
@@ -942,6 +1112,14 @@
public void gameEvent(GameEvent gameevent, Vec3D vec3d, GameEvent.a gameevent_a) {
int i = gameevent.getNotificationRadius();
BlockPosition blockposition = new BlockPosition(vec3d);
@@ -441,7 +441,7 @@
int j = SectionPosition.blockToSectionCoord(blockposition.getX() - i);
int k = SectionPosition.blockToSectionCoord(blockposition.getY() - i);
int l = SectionPosition.blockToSectionCoord(blockposition.getZ() - i);
@@ -1013,7 +1191,18 @@
@@ -1014,7 +1192,18 @@
Iterator iterator = this.navigatingMobs.iterator();
while (iterator.hasNext()) {
@@ -461,7 +461,7 @@
NavigationAbstract navigationabstract = entityinsentient.getNavigation();
if (navigationabstract.shouldRecomputePath(blockposition)) {
@@ -1069,10 +1258,20 @@
@@ -1070,10 +1259,20 @@
@Override
public Explosion explode(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, Explosion.Effect explosion_effect) {
@@ -482,7 +482,7 @@
if (explosion_effect == Explosion.Effect.NONE) {
explosion.clearToBlow();
}
@@ -1144,13 +1343,20 @@
@@ -1145,13 +1344,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) {
@@ -505,7 +505,7 @@
++j;
}
}
@@ -1201,7 +1407,7 @@
@@ -1202,7 +1408,7 @@
@Nullable
public BlockPosition findNearestMapStructure(TagKey<Structure> tagkey, BlockPosition blockposition, int i, boolean flag) {
@@ -514,7 +514,7 @@
return null;
} else {
Optional<HolderSet.Named<Structure>> optional = this.registryAccess().registryOrThrow(IRegistry.STRUCTURE_REGISTRY).getTag(tagkey);
@@ -1243,11 +1449,21 @@
@@ -1244,11 +1450,21 @@
@Nullable
@Override
public WorldMap getMapData(String s) {
@@ -537,7 +537,7 @@
this.getServer().overworld().getDataStorage().set(s, worldmap);
}
@@ -1545,6 +1761,11 @@
@@ -1546,6 +1762,11 @@
@Override
public void blockUpdated(BlockPosition blockposition, Block block) {
if (!this.isDebug()) {
@@ -549,7 +549,7 @@
this.updateNeighborsAt(blockposition, block);
}
@@ -1564,12 +1785,12 @@
@@ -1565,12 +1786,12 @@
}
public boolean isFlat() {
@@ -564,7 +564,7 @@
}
@Nullable
@@ -1592,7 +1813,7 @@
@@ -1593,7 +1814,7 @@
private static <T> String getTypeCount(Iterable<T> iterable, Function<T, String> function) {
try {
Object2IntOpenHashMap<String> object2intopenhashmap = new Object2IntOpenHashMap();
@@ -573,7 +573,7 @@
while (iterator.hasNext()) {
T t0 = iterator.next();
@@ -1601,7 +1822,7 @@
@@ -1602,7 +1823,7 @@
object2intopenhashmap.addTo(s, 1);
}
@@ -582,7 +582,7 @@
String s1 = (String) entry.getKey();
return s1 + ":" + entry.getIntValue();
@@ -1612,17 +1833,33 @@
@@ -1613,17 +1834,33 @@
}
public static void makeObsidianPlatform(WorldServer worldserver) {
@@ -618,7 +618,7 @@
}
@Override
@@ -1733,6 +1970,7 @@
@@ -1734,6 +1971,7 @@
}
entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
@@ -626,7 +626,7 @@
}
public void onTrackingEnd(Entity entity) {
@@ -1769,6 +2007,14 @@
@@ -1770,6 +2008,14 @@
}
entity.updateDynamicGameEventListener(DynamicGameEventListener::remove);