mirror of
https://github.com/LeavesMC/Leaves.git
synced 2026-01-04 15:41:31 +00:00
127 lines
7.8 KiB
Diff
127 lines
7.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Sun, 2 Jul 2023 09:25:00 +0800
|
|
Subject: [PATCH] Elytra aeronautics no chunk load
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
|
index e0650881a3f90532fc446607cf5ae34da4a2a1dc..07d75d8d518456387393ecf371bc1947e1ea4bb5 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
|
@@ -749,7 +749,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
|
}
|
|
|
|
private boolean skipPlayer(ServerPlayer player) {
|
|
- return player.isSpectator() && !this.level.getGameRules().getBoolean(GameRules.RULE_SPECTATORSGENERATECHUNKS);
|
|
+ return (player.isSpectator() && !this.level.getGameRules().getBoolean(GameRules.RULE_SPECTATORSGENERATECHUNKS))
|
|
+ || (org.leavesmc.leaves.LeavesConfig.elytraAeronauticsNoChunk && player.elytraAeronauticsNoChunk); // Leaves - Elytra aeronautics
|
|
}
|
|
|
|
void updatePlayerStatus(ServerPlayer player, boolean added) {
|
|
@@ -787,6 +788,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
|
}
|
|
|
|
public void move(ServerPlayer player) {
|
|
+ if (player.elytraAeronauticsNoChunk) return; // Leaves - no chunk
|
|
// Paper - optimise entity tracker
|
|
|
|
SectionPos sectionposition = player.getLastSectionPos();
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index 88e15a2a90485e461df242a1071ecb5b567c46aa..1e4364e4dbc35064fe06a92b7c2c3baae07b0326 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -559,7 +559,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
|
|
|
|
// Paper start - Prevent moving into unloaded chunks
|
|
- if (this.player.level().paperConfig().chunks.preventMovingIntoUnloadedChunks && (
|
|
+ if (this.player.level().paperConfig().chunks.preventMovingIntoUnloadedChunks && !player.elytraAeronauticsNoChunk && ( // Leaves - no chunk load
|
|
!worldserver.areChunksLoadedForMove(this.player.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(this.player.position()))) ||
|
|
!worldserver.areChunksLoadedForMove(entity.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(entity.position())))
|
|
)) {
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
index 6d97b1be9192d237e5ed2cef94ec9bd72881e156..c7e3772a031c997d43120c3ec95b30093b3ea7eb 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -1138,7 +1138,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
return;
|
|
}
|
|
}
|
|
-
|
|
+ // Leaves start - elytra aeronautics
|
|
+ if (org.leavesmc.leaves.LeavesConfig.elytraAeronauticsNoChunk && this instanceof Player player) {
|
|
+ if (movementType == MoverType.PLAYER && player.isFallFlying()) {
|
|
+ org.leavesmc.leaves.util.ElytraAeronauticsHelper.flightBehaviour(player, movement);
|
|
+ }
|
|
+ }
|
|
+ // Leaves end - elytra aeronautics
|
|
this.level().getProfiler().push("move");
|
|
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
|
|
movement = movement.multiply(this.stuckSpeedMultiplier);
|
|
@@ -2098,6 +2104,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
this.yo = y;
|
|
this.zo = d4;
|
|
this.setPos(d3, y, d4);
|
|
+ if (this instanceof Player player && player.elytraAeronauticsNoChunk) return; // Leaves - elytra aeronautics
|
|
if (this.valid) this.level.getChunk((int) Math.floor(this.getX()) >> 4, (int) Math.floor(this.getZ()) >> 4); // CraftBukkit
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
index a570e9ef4b2b767af3ebb2b33230eb7877553a85..b737848442843b4d7decc140f51f77ed6f7c5f4b 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
@@ -197,6 +197,7 @@ public abstract class Player extends LivingEntity {
|
|
private int currentImpulseContextResetGraceTime;
|
|
public boolean affectsSpawning = true; // Paper - Affects Spawning API
|
|
public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
|
|
+ public boolean elytraAeronauticsNoChunk = false; // Leaves - Elytra aeronautics
|
|
|
|
// CraftBukkit start
|
|
public boolean fauxSleeping;
|
|
diff --git a/src/main/java/org/leavesmc/leaves/util/ElytraAeronauticsHelper.java b/src/main/java/org/leavesmc/leaves/util/ElytraAeronauticsHelper.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..0a9cde390476a728dd43f017e3eac3c923709b72
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/leavesmc/leaves/util/ElytraAeronauticsHelper.java
|
|
@@ -0,0 +1,40 @@
|
|
+package org.leavesmc.leaves.util;
|
|
+
|
|
+import ca.spottedleaf.moonrise.common.util.ChunkSystem;
|
|
+import net.minecraft.core.SectionPos;
|
|
+import net.minecraft.network.chat.Component;
|
|
+import net.minecraft.server.level.ServerLevel;
|
|
+import net.minecraft.server.level.ServerPlayer;
|
|
+import net.minecraft.world.entity.player.Player;
|
|
+import net.minecraft.world.phys.Vec3;
|
|
+import org.leavesmc.leaves.LeavesConfig;
|
|
+
|
|
+public class ElytraAeronauticsHelper {
|
|
+
|
|
+ public static void flightBehaviour(Player player, Vec3 velocity) {
|
|
+ if (LeavesConfig.elytraAeronauticsNoChunk) {
|
|
+ if ((LeavesConfig.elytraAeronauticsNoChunkSpeed <= 0.0D || velocity.horizontalDistanceSqr() >= LeavesConfig.elytraAeronauticsNoChunkSpeed)
|
|
+ && (LeavesConfig.elytraAeronauticsNoChunkHeight <= 0.0D || player.getY() >= LeavesConfig.elytraAeronauticsNoChunkHeight)) {
|
|
+ if (!player.elytraAeronauticsNoChunk) {
|
|
+ player.elytraAeronauticsNoChunk = true;
|
|
+ ServerPlayer serverPlayer = (ServerPlayer) player;
|
|
+ if (LeavesConfig.elytraAeronauticsNoChunkMes) {
|
|
+ serverPlayer.sendSystemMessage(Component.literal(LeavesConfig.elytraAeronauticsNoChunkStartMes), true);
|
|
+ }
|
|
+ ChunkSystem.removePlayerFromDistanceMaps((ServerLevel) serverPlayer.level(), serverPlayer);
|
|
+ ((ServerLevel) serverPlayer.level()).chunkSource.chunkMap.getDistanceManager().removePlayer(serverPlayer.getLastSectionPos(), serverPlayer);
|
|
+ }
|
|
+ } else {
|
|
+ if (player.elytraAeronauticsNoChunk) {
|
|
+ player.elytraAeronauticsNoChunk = false;
|
|
+ ServerPlayer serverPlayer = (ServerPlayer) player;
|
|
+ if (LeavesConfig.elytraAeronauticsNoChunkMes) {
|
|
+ serverPlayer.sendSystemMessage(Component.literal(LeavesConfig.elytraAeronauticsNoChunkEndMes), true);
|
|
+ }
|
|
+ ChunkSystem.addPlayerToDistanceMaps((ServerLevel) serverPlayer.level(), serverPlayer);
|
|
+ ((ServerLevel) serverPlayer.level()).chunkSource.chunkMap.getDistanceManager().addPlayer(SectionPos.of(serverPlayer), serverPlayer);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+}
|