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

Repackage NMS

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-03-16 09:00:00 +11:00
parent 18496e998f
commit 9da047989c
968 changed files with 5448 additions and 5050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
paper-server/nms-patches/net/minecraft/world/level/levelgen/ChunkGeneratorAbstract.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/ChunkGeneratorAbstract.java
+++ b/net/minecraft/server/ChunkGeneratorAbstract.java
@@ -24,7 +24,7 @@
--- a/net/minecraft/world/level/levelgen/ChunkGeneratorAbstract.java
+++ b/net/minecraft/world/level/levelgen/ChunkGeneratorAbstract.java
@@ -58,7 +58,7 @@
return chunkgeneratorabstract.h;
})).apply(instance, instance.stable(ChunkGeneratorAbstract::new));
});
@@ -9,7 +9,7 @@
for (int i = 0; i < 24; ++i) {
for (int j = 0; j < 24; ++j) {
for (int k = 0; k < 24; ++k) {
@@ -34,7 +34,7 @@
@@ -68,7 +68,7 @@
}
});
@@ -18,7 +18,7 @@
for (int i = -2; i <= 2; ++i) {
for (int j = -2; j <= 2; ++j) {
float f = 10.0F / MathHelper.c((float) (i * i + j * j) + 0.2F);
@@ -193,6 +193,11 @@
@@ -227,6 +227,11 @@
f6 = f4;
f7 = f5;
}

6
paper-server/nms-patches/net/minecraft/world/level/levelgen/MobSpawnerPatrol.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/MobSpawnerPatrol.java
+++ b/net/minecraft/server/MobSpawnerPatrol.java
@@ -102,7 +102,7 @@
--- a/net/minecraft/world/level/levelgen/MobSpawnerPatrol.java
+++ b/net/minecraft/world/level/levelgen/MobSpawnerPatrol.java
@@ -118,7 +118,7 @@
entitymonsterpatrolling.setPosition((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
entitymonsterpatrolling.prepare(worldserver, worldserver.getDamageScaler(blockposition), EnumMobSpawn.PATROL, (GroupDataEntity) null, (NBTTagCompound) null);

6
paper-server/nms-patches/net/minecraft/world/level/levelgen/MobSpawnerPhantom.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/MobSpawnerPhantom.java
+++ b/net/minecraft/server/MobSpawnerPhantom.java
@@ -57,7 +57,7 @@
--- a/net/minecraft/world/level/levelgen/MobSpawnerPhantom.java
+++ b/net/minecraft/world/level/levelgen/MobSpawnerPhantom.java
@@ -77,7 +77,7 @@
entityphantom.setPositionRotation(blockposition1, 0.0F, 0.0F);
groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);

16
paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/PersistentStructureLegacy.patch
View File

@@ -1,7 +1,13 @@
--- a/net/minecraft/server/PersistentStructureLegacy.java
+++ b/net/minecraft/server/PersistentStructureLegacy.java
@@ -14,7 +14,7 @@
--- a/net/minecraft/world/level/levelgen/structure/PersistentStructureLegacy.java
+++ b/net/minecraft/world/level/levelgen/structure/PersistentStructureLegacy.java
@@ -20,9 +20,13 @@
import net.minecraft.world.level.levelgen.feature.StructureGenerator;
import net.minecraft.world.level.storage.WorldPersistentData;
+// CraftBukkit start
+import net.minecraft.world.level.dimension.DimensionManager;
+// CraftBukkit end
+
public class PersistentStructureLegacy {
- private static final Map<String, String> a = (Map) SystemUtils.a((Object) Maps.newHashMap(), (hashmap) -> {
@@ -9,7 +15,7 @@
hashmap.put("Village", "Village");
hashmap.put("Mineshaft", "Mineshaft");
hashmap.put("Mansion", "Mansion");
@@ -27,7 +27,7 @@
@@ -35,7 +39,7 @@
hashmap.put("Fortress", "Fortress");
hashmap.put("EndCity", "EndCity");
});
@@ -18,7 +24,7 @@
hashmap.put("Iglu", "Igloo");
hashmap.put("TeDP", "Desert_Pyramid");
hashmap.put("TeJP", "Jungle_Pyramid");
@@ -228,16 +228,16 @@
@@ -236,16 +240,16 @@
}
}

8
paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/WorldGenWitchHut.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/WorldGenWitchHut.java
+++ b/net/minecraft/server/WorldGenWitchHut.java
@@ -85,7 +85,7 @@
--- a/net/minecraft/world/level/levelgen/structure/WorldGenWitchHut.java
+++ b/net/minecraft/world/level/levelgen/structure/WorldGenWitchHut.java
@@ -106,7 +106,7 @@
entitywitch.setPersistent();
entitywitch.setPositionRotation((double) j + 0.5D, (double) i, (double) k + 0.5D, 0.0F, 0.0F);
entitywitch.prepare(generatoraccessseed, generatoraccessseed.getDamageScaler(new BlockPosition(j, i, k)), EnumMobSpawn.STRUCTURE, (GroupDataEntity) null, (NBTTagCompound) null);
@@ -9,7 +9,7 @@
}
}
@@ -107,7 +107,7 @@
@@ -128,7 +128,7 @@
entitycat.setPersistent();
entitycat.setPositionRotation((double) i + 0.5D, (double) j, (double) k + 0.5D, 0.0F, 0.0F);
entitycat.prepare(worldaccess, worldaccess.getDamageScaler(new BlockPosition(i, j, k)), EnumMobSpawn.STRUCTURE, (GroupDataEntity) null, (NBTTagCompound) null);

12
paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/DefinedStructure.java
+++ b/net/minecraft/server/DefinedStructure.java
@@ -98,7 +98,7 @@
--- a/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure.java
+++ b/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure.java
@@ -134,7 +134,7 @@
}
private static List<DefinedStructure.BlockInfo> a(List<DefinedStructure.BlockInfo> list, List<DefinedStructure.BlockInfo> list1, List<DefinedStructure.BlockInfo> list2) {
@@ -9,7 +9,7 @@
return definedstructure_blockinfo.a.getY();
}).thenComparingInt((definedstructure_blockinfo) -> {
return definedstructure_blockinfo.a.getX();
@@ -118,7 +118,7 @@
@@ -154,7 +154,7 @@
}
private void a(World world, BlockPosition blockposition, BlockPosition blockposition1) {
@@ -18,7 +18,7 @@
return !(entity instanceof EntityHuman);
});
@@ -430,11 +430,13 @@
@@ -466,11 +466,13 @@
}
private static Optional<Entity> a(WorldAccess worldaccess, NBTTagCompound nbttagcompound) {
@@ -36,7 +36,7 @@
}
public BlockPosition a(EnumBlockRotation enumblockrotation) {
@@ -869,7 +871,7 @@
@@ -905,7 +907,7 @@
public IBlockData a(int i) {
IBlockData iblockdata = (IBlockData) this.b.fromId(i);

8
paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructureManager.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/DefinedStructureManager.java
+++ b/net/minecraft/server/DefinedStructureManager.java
@@ -19,7 +19,7 @@
--- a/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructureManager.java
+++ b/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructureManager.java
@@ -31,7 +31,7 @@
public class DefinedStructureManager {
private static final Logger LOGGER = LogManager.getLogger();
@@ -8,4 +8,4 @@
+ private final Map<MinecraftKey, DefinedStructure> b = Maps.newConcurrentMap(); // SPIGOT-5287
private final DataFixer c;
private IResourceManager d;
private final java.nio.file.Path e;
private final Path e;