Compare commits

..

4 Commits

Author SHA1 Message Date
MrHua269
4347dee5fa Fix java CP 2024-10-06 11:51:31 +08:00
MrHua269
5734e51889 Try fixing folia spector teleportation fix 2024-10-06 11:23:53 +08:00
M2ke4U
f17ba0d315 [ci skip] Updated maven repo 2024-10-01 22:11:17 +08:00
M2ke4U
e6cd6d964a Update maven repo 2024-10-01 22:08:11 +08:00
4 changed files with 29 additions and 15 deletions

View File

@@ -33,12 +33,12 @@
```kotlin
repositories {
maven {
url = "http://maven.moliatopia.icu/repository/maven-snapshots/"
url = "http://maven.nostal.ink/repository/maven-snapshots/"
}
}
dependencies {
compileOnly("me.earthme.luminol:luminol-api:1.20.6-R0.1-SNAPSHOT")
compileOnly("me.earthme.luminol:luminol-api:1.20.6-R0.1-20241001.135131-1")
}
```
@@ -47,8 +47,8 @@ dependencies {
```xml
<repositories>
<repository>
<id>moliatopia</id>
<url>http://maven.moliatopia.icu/repository/maven-snapshots/</url>
<id>nostal</id>
<url>http://maven.nostal.ink/repository/maven-snapshots/</url>
</repository>
</repositories>
@@ -56,7 +56,7 @@ dependencies {
<dependency>
<groupId>me.earthme.luminol</groupId>
<artifactId>luminol-api</artifactId>
<version>1.20.6-R0.1-SNAPSHOT</version>
<version>1.20.6-R0.1-20241001.135131-1</version>
</dependency>
</dependencies>
```

View File

@@ -34,12 +34,12 @@ For gradle:
```kotlin
repositories {
maven {
url = "http://maven.moliatopia.icu/repository/maven-snapshots/"
url = "https://maven.nostal.ink/repository/maven-snapshots/"
}
}
dependencies {
compileOnly("me.earthme.luminol:luminol-api:1.20.6-R0.1-SNAPSHOT")
compileOnly("me.earthme.luminol:luminol-api:1.20.6-R0.1-20241001.135131-1")
}
```
@@ -48,8 +48,8 @@ For maven
```xml
<repositories>
<repository>
<id>moliatopia</id>
<url>http://maven.moliatopia.icu/repository/maven-snapshots/</url>
<id>nostal</id>
<url>http://maven.nostal.ink/repository/maven-snapshots/</url>
</repository>
</repositories>
@@ -57,7 +57,7 @@ For maven
<dependency>
<groupId>me.earthme.luminol</groupId>
<artifactId>luminol-api</artifactId>
<version>1.20.6-R0.1-SNAPSHOT</version>
<version>1.20.6-R0.1-20241001.135131-1</version>
</dependency>
</dependencies>
```

View File

@@ -36,10 +36,10 @@ index 0000000000000000000000000000000000000000..01f8c6ff3662569be5a4ff998bcd4fbb
+ }
+}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 92e9860b146b6e3e1dc593bfd5bfddab3318761d..bdcf43104a53f530453615b17bd690c7a5c0a78d 100644
index 92e9860b146b6e3e1dc593bfd5bfddab3318761d..cd411f0a178e3c4c20f1b5aecee2617a2ce6c8f3 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -894,6 +894,11 @@ public class ServerPlayer extends Player {
@@ -894,9 +894,24 @@ public class ServerPlayer extends Player {
}
Entity entity = this.getCamera();
@@ -50,4 +50,18 @@ index 92e9860b146b6e3e1dc593bfd5bfddab3318761d..bdcf43104a53f530453615b17bd690c7
+ //Luminol end
if (entity != this) {
if (entity.isAlive()) {
- if (entity.isAlive()) {
+ // Luminol start - Fix folia spector teleportation
+ var flag = false;
+ var cameraPos = entity.blockPosition();
+ var cameraLevel = entity.level();
+ if (!io.papermc.paper.util.TickThread.isTickThreadFor((ServerLevel) cameraLevel, cameraPos) && me.earthme.luminol.config.modules.fixes.FoliaSpectorTeleportationFixConfig.fixSpectorTeleportFolia){
+ this.setCamera(this);
+ flag = true;
+ }
+ // Luminol end
+
+ if (entity.isAlive() && !flag) { // Luminol - Fix folia spector teleportation
this.absMoveTo(entity.getX(), entity.getY(), entity.getZ(), entity.getYRot(), entity.getXRot());
this.serverLevel().getChunkSource().move(this);
if (this.wantsToStopRiding()) {

View File

@@ -248,7 +248,7 @@ index 12c46e7a3f6a8675921d95dee97ece4a83252282..573cca66b905c5decb0e59c58cfa861d
} else {
passenger.stopRiding();
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8ec763f933e79a1c8e7a7d3b3c0277ca2fca4b74..5fe7fb97b431ae0004e25b872e372e13f92403a0 100644
index ea3cf67d65155d72a42e39bc45dd0546ae780670..0fa0f7dc32bae5c5c5d3426e28b8156b9305efb2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -352,6 +352,25 @@ public class ServerPlayer extends Player {
@@ -277,7 +277,7 @@ index 8ec763f933e79a1c8e7a7d3b3c0277ca2fca4b74..5fe7fb97b431ae0004e25b872e372e13
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
this.chatVisibility = ChatVisiblity.FULL;
@@ -925,6 +944,12 @@ public class ServerPlayer extends Player {
@@ -935,6 +954,12 @@ public class ServerPlayer extends Player {
this.trackEnteredOrExitedLavaOnVehicle();
this.updatePlayerAttributes();
this.advancements.flushDirty(this);