mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-08 11:24:11 +01:00
SPIGOT-6347: Nether Portals Default to Nether, even in Nether
By: md_5 <git@md-5.net>
This commit is contained in:
parent
849c37e463
commit
98e0c5c715
1 changed files with 6 additions and 2 deletions
|
@ -500,8 +500,12 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
protected boolean q(Entity entity) {
|
protected boolean q(Entity entity) {
|
||||||
@@ -1649,11 +1953,17 @@
|
@@ -1646,14 +1950,20 @@
|
||||||
ResourceKey<World> resourcekey = this.world.getDimensionKey() == World.THE_NETHER ? World.OVERWORLD : World.THE_NETHER;
|
|
||||||
|
if (this.inPortal) {
|
||||||
|
MinecraftServer minecraftserver = worldserver.getMinecraftServer();
|
||||||
|
- ResourceKey<World> resourcekey = this.world.getDimensionKey() == World.THE_NETHER ? World.OVERWORLD : World.THE_NETHER;
|
||||||
|
+ ResourceKey<World> resourcekey = this.world.getTypeKey() == DimensionManager.THE_NETHER ? World.OVERWORLD : World.THE_NETHER; // CraftBukkit
|
||||||
WorldServer worldserver1 = minecraftserver.getWorldServer(resourcekey);
|
WorldServer worldserver1 = minecraftserver.getWorldServer(resourcekey);
|
||||||
|
|
||||||
- if (worldserver1 != null && minecraftserver.getAllowNether() && !this.isPassenger() && this.portalTicks++ >= i) {
|
- if (worldserver1 != null && minecraftserver.getAllowNether() && !this.isPassenger() && this.portalTicks++ >= i) {
|
||||||
|
|
Loading…
Reference in a new issue