mirror of
https://github.com/LeavesMC/Leaves.git
synced 2026-01-03 22:26:12 +00:00
Update Paper
This commit is contained in:
@@ -167,7 +167,7 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..8bd801e15408bf5284acec33bdf3c798
|
||||
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
|
||||
this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 64adb7da5c745b7800c1060b276e28f27602c535..b3ab3f17ebbcd2e02ac93391699c40cc6c364234 100644
|
||||
index fb5f3745dd9435aa20b159caf8a3d0d53b0de340..47f6d557df3e1f91603b0d4343f8f4e27db63326 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -298,7 +298,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -285,7 +285,7 @@ index afbe41b671073232614a1de246bea30ea2a26929..dea28bf8e1c0f67f13cc51d9e2cc6da6
|
||||
+ // Leaves end - fakeplayer support
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index f2572810c52b948d7c83b88afe5f2c6b898888da..167ac5d96c8abd67b8dc987560e792837348cae4 100644
|
||||
index 34a34cee0402c03a1ffb35cfc8c422594054c88a..85d50d082dfb55dcca2be4a7764175784b013ee9 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -1416,7 +1416,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
@@ -298,7 +298,7 @@ index f2572810c52b948d7c83b88afe5f2c6b898888da..167ac5d96c8abd67b8dc987560e79283
|
||||
final boolean xZero = movement.x == 0.0;
|
||||
final boolean yZero = movement.y == 0.0;
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
||||
index a9eaa079a43bc8a5e81deaf6df5ce2f9c53cb319..d0752407684312982188abd0fa4af4f706edc3e3 100644
|
||||
index a2093158e57d5f43c4afa66386481b82b3c4c3c4..35672105a000d87c7fe82eb65456d891b3bd983d 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
||||
@@ -61,7 +61,7 @@ public class FishingHook extends Projectile {
|
||||
@@ -364,10 +364,10 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..c51413bf02b3572a05f09d2f0d02493d
|
||||
if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper
|
||||
BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 74fecfb582cbc42dafa1ee9590e98478cd61a01f..96122de9875889efb1b14f2d1d23ef19d54b5453 100644
|
||||
index 98924f31ea97dbdf61dc0d59e423ba9d22b07b85..be41bc7bad37ccfb9d9b7a268a4a702db8c66f4f 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -262,6 +262,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
|
||||
@@ -264,6 +264,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
|
||||
import org.yaml.snakeyaml.error.MarkedYAMLException;
|
||||
|
||||
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
|
||||
@@ -375,7 +375,7 @@ index 74fecfb582cbc42dafa1ee9590e98478cd61a01f..96122de9875889efb1b14f2d1d23ef19
|
||||
|
||||
import javax.annotation.Nullable; // Paper
|
||||
import javax.annotation.Nonnull; // Paper
|
||||
@@ -307,6 +308,7 @@ public final class CraftServer implements Server {
|
||||
@@ -309,6 +310,7 @@ public final class CraftServer implements Server {
|
||||
public static Exception excessiveVelEx; // Paper - Velocity warnings
|
||||
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
|
||||
private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper
|
||||
@@ -383,7 +383,7 @@ index 74fecfb582cbc42dafa1ee9590e98478cd61a01f..96122de9875889efb1b14f2d1d23ef19
|
||||
|
||||
// Paper start - Folia region threading API
|
||||
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
|
||||
@@ -3146,4 +3148,11 @@ public final class CraftServer implements Server {
|
||||
@@ -3209,4 +3211,11 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
// Paper end
|
||||
@@ -396,7 +396,7 @@ index 74fecfb582cbc42dafa1ee9590e98478cd61a01f..96122de9875889efb1b14f2d1d23ef19
|
||||
+ // Leaves end - Bot API
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index 90b04377088fcaf128cb35843702d2f5ead4b7f6..3a9430ab1661ee36985a4cee4289e84c1b254cdc 100644
|
||||
index 0e6c7284b9aee6c5f2454a3a095ebf349f887740..f1343e71eaf0592b4efa5ba5d60cb5e9973f71e1 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -194,6 +194,8 @@ import org.bukkit.plugin.Plugin;
|
||||
|
||||
Reference in New Issue
Block a user