twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-04 22:22:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source
This commit is contained in:
md_5
2018-07-15 10:00:00 +10:00
parent 57ab4cfc6f
commit 421c1728c8
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
nms-patches/MobSpawnerAbstract.patch
View File

@@ -1,39 +1,19 @@
--- a/net/minecraft/server/MobSpawnerAbstract.java
+++ b/net/minecraft/server/MobSpawnerAbstract.java
@@ -12,13 +12,13 @@
private MobSpawnerData spawnData = new MobSpawnerData();
private double d;
private double e;
- private int minSpawnDelay = 200;
- private int maxSpawnDelay = 800;
- private int spawnCount = 4;
+ public int minSpawnDelay = 200; // CraftBukkit private -> public
+ public int maxSpawnDelay = 800; // CraftBukkit private -> public
+ public int spawnCount = 4; // CraftBukkit private -> public
private Entity i;
- private int maxNearbyEntities = 6;
- private int requiredPlayerRange = 16;
- private int spawnRange = 4;
+ public int maxNearbyEntities = 6; // CraftBukkit private -> public
+ public int requiredPlayerRange = 16; // CraftBukkit private -> public
+ public int spawnRange = 4; // CraftBukkit private -> public
public MobSpawnerAbstract() {}
@@ -32,6 +32,7 @@
public void setMobName(@Nullable MinecraftKey minecraftkey) {
if (minecraftkey != null) {
this.spawnData.b().setString("id", minecraftkey.toString());
+ this.mobs.clear(); // CraftBukkit - SPIGOT-3496, MC-92282
}
@@ -41,6 +41,7 @@
public void setMobName(EntityTypes<?> entitytypes) {
this.spawnData.b().setString("id", ((MinecraftKey) EntityTypes.REGISTRY.b(entitytypes)).toString());
+ this.mobs.clear(); // CraftBukkit - SPIGOT-3496, MC-92282
}
@@ -102,7 +103,7 @@
((EntityInsentient) entity).prepare(world.D(new BlockPosition(entity)), (GroupDataEntity) null);
private boolean h() {
@@ -110,7 +111,7 @@
((EntityInsentient) entity).prepare(world.getDamageScaler(new BlockPosition(entity)), (GroupDataEntity) null, (NBTTagCompound) null);
}
- ChunkRegionLoader.a(entity, world);
+ ChunkRegionLoader.a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
- ChunkRegionLoader.a(entity, (GeneratorAccess) world);
+ ChunkRegionLoader.a(entity, (GeneratorAccess) world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
world.triggerEffect(2004, blockposition, 0);
if (entityinsentient != null) {
entityinsentient.doSpawnEffect();