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

Update to Minecraft 1.17

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-server/nms-patches/net/minecraft/world/level/block/BlockFireAbstract.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/BlockFireAbstract.java
+++ b/net/minecraft/world/level/block/BlockFireAbstract.java
@@ -50,7 +50,14 @@
@@ -125,7 +125,14 @@
if (!entity.isFireProof()) {
entity.setFireTicks(entity.getFireTicks() + 1);
if (entity.getFireTicks() == 0) {
@@ -15,8 +15,8 @@
+ // CraftBukkit end
}
entity.damageEntity(DamageSource.FIRE, this.b);
@@ -72,14 +79,14 @@
entity.damageEntity(DamageSource.IN_FIRE, this.fireDamage);
@@ -147,14 +154,14 @@
}
if (!iblockdata.canPlace(world, blockposition)) {
@@ -28,12 +28,12 @@
}
private static boolean a(World world) {
- return world.getDimensionKey() == World.OVERWORLD || world.getDimensionKey() == World.THE_NETHER;
+ return world.getTypeKey() == net.minecraft.world.level.dimension.DimensionManager.OVERWORLD || world.getTypeKey() == net.minecraft.world.level.dimension.DimensionManager.THE_NETHER; // CraftBukkit - getTypeKey()
- return world.getDimensionKey() == World.OVERWORLD || world.getDimensionKey() == World.NETHER;
+ return world.getTypeKey() == net.minecraft.world.level.dimension.DimensionManager.OVERWORLD_LOCATION || world.getTypeKey() == net.minecraft.world.level.dimension.DimensionManager.NETHER_LOCATION; // CraftBukkit - getTypeKey()
}
@Override
@@ -123,4 +130,12 @@
@@ -202,4 +209,12 @@
}
}
}