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

Update to Minecraft 1.15

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
paper-server/nms-patches/EntityVillager.patch
View File

@@ -33,10 +33,10 @@
- this.getBehaviorController().a((WorldServer) this.world, (EntityLiving) this);
+ this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error
this.world.getMethodProfiler().exit();
if (!this.dY() && this.bE > 0) {
--this.bE;
if (!this.et() && this.bB > 0) {
--this.bB;
@@ -134,7 +144,7 @@
this.bF = false;
this.bC = false;
}
- this.addEffect(new MobEffect(MobEffects.REGENERATION, 200, 0));
@@ -44,7 +44,7 @@
}
}
@@ -351,7 +361,14 @@
@@ -353,7 +363,14 @@
while (iterator.hasNext()) {
MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
@@ -60,7 +60,7 @@
}
}
@@ -673,7 +690,12 @@
@@ -658,7 +675,12 @@
entitywitch.setCustomNameVisible(this.getCustomNameVisible());
}
@@ -74,16 +74,16 @@
this.die();
}
@@ -823,7 +845,7 @@
@@ -808,7 +830,7 @@
}
private void b(long i) {
- this.br.setMemory(MemoryModuleType.GOLEM_LAST_SEEN_TIME, (Object) i);
+ this.br.setMemory(MemoryModuleType.GOLEM_LAST_SEEN_TIME, i); // CraftBukkit - decompile error
- this.bo.setMemory(MemoryModuleType.GOLEM_LAST_SEEN_TIME, (Object) i);
+ this.bo.setMemory(MemoryModuleType.GOLEM_LAST_SEEN_TIME, i); // CraftBukkit - decompile error
}
private boolean c(long i) {
@@ -872,7 +894,7 @@
@@ -857,7 +879,7 @@
if (entityirongolem != null) {
if (entityirongolem.a((GeneratorAccess) this.world, EnumMobSpawn.MOB_SUMMONED) && entityirongolem.a((IWorldReader) this.world)) {
@@ -92,12 +92,19 @@
return entityirongolem;
}
@@ -933,7 +955,7 @@
@@ -919,13 +941,13 @@
@Override
public void e(BlockPosition blockposition) {
super.e(blockposition);
- this.br.setMemory(MemoryModuleType.LAST_SLEPT, (Object) MinecraftSerializableLong.a(this.world.getTime()));
+ this.br.setMemory(MemoryModuleType.LAST_SLEPT, MinecraftSerializableLong.a(this.world.getTime())); // CraftBukkit - decompile error
public void entitySleep(BlockPosition blockposition) {
super.entitySleep(blockposition);
- this.bo.setMemory(MemoryModuleType.LAST_SLEPT, (Object) MinecraftSerializableLong.a(this.world.getTime()));
+ this.bo.setMemory(MemoryModuleType.LAST_SLEPT, MinecraftSerializableLong.a(this.world.getTime())); // CraftBukkit - decompile error
}
@Override
public void entityWakeup() {
super.entityWakeup();
- this.bo.setMemory(MemoryModuleType.LAST_WOKEN, (Object) MinecraftSerializableLong.a(this.world.getTime()));
+ this.bo.setMemory(MemoryModuleType.LAST_WOKEN, MinecraftSerializableLong.a(this.world.getTime())); // CraftBukkit - decompile error
}
private boolean d(long i) {