Update to Minecraft 1.13-pre7

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

View File

@@ -0,0 +1,30 @@
--- a/net/minecraft/server/RegionLimitedWorldAccess.java
+++ b/net/minecraft/server/RegionLimitedWorldAccess.java
@@ -25,10 +25,10 @@
private final Random k;
private final WorldProvider l;
private final GeneratorSettings m;
- private final TickList<Block> n = new TickListWorldGen((blockposition) -> {
+ private final TickList<Block> n = new TickListWorldGen<>((blockposition) -> { // CraftBukkit - decompile error
return this.y(blockposition).k();
});
- private final TickList<FluidType> o = new TickListWorldGen((blockposition) -> {
+ private final TickList<FluidType> o = new TickListWorldGen<>((blockposition) -> { // CraftBukkit - decompile error
return this.y(blockposition).l();
});
@@ -204,7 +204,14 @@
this.y(blockposition).e(blockposition);
}
+ // CraftBukkit start
public boolean addEntity(Entity entity) {
+ return addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
+ }
+
+ @Override
+ public boolean addEntity(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
+ // CraftBukkit end
int i = MathHelper.floor(entity.locX / 16.0D);
int j = MathHelper.floor(entity.locZ / 16.0D);