Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-20 07:29:17 +00:00
Code Issues Releases Activity

修复错误

Browse Source
This commit is contained in:
XiaoMoMi
2025-12-06 17:20:34 +08:00
parent 4de73b4ffe
commit aab16be43c
7 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/BukkitEntity.java
View File

@@ -46,7 +46,7 @@ public class BukkitEntity extends AbstractEntity {
} }
@Override @Override
public int entityID() { public int entityId() {
return platformEntity().getEntityId(); return platformEntity().getEntityId();
} }

18
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
View File

@@ -588,7 +588,7 @@ public class BukkitServerPlayer extends Player {
} }
if (Config.predictBreaking() && this.eyeLocation != null && !this.isDestroyingCustomBlock && !unsureEyeLocation.equals(this.eyeLocation)) { if (Config.predictBreaking() && this.eyeLocation != null && !this.isDestroyingCustomBlock && !unsureEyeLocation.equals(this.eyeLocation)) {
// if it's not destroying blocks, we do predict // if it's not destroying blocks, we do predict
if ((gameTicks() + entityID()) % Config.predictBreakingInterval() == 0) { if ((gameTicks() + entityId()) % Config.predictBreakingInterval() == 0) {
this.predictNextBlockToMine(); this.predictNextBlockToMine();
} }
} }
@@ -807,7 +807,7 @@ public class BukkitServerPlayer extends Player {
if (VersionHelper.isOrAbove1_20_5()) { if (VersionHelper.isOrAbove1_20_5()) {
Object serverPlayer = serverPlayer(); Object serverPlayer = serverPlayer();
Object attributeInstance = CoreReflections.methodHandle$ServerPlayer$getAttributeMethod.invokeExact(serverPlayer, MAttributeHolders.BLOCK_BREAK_SPEED); Object attributeInstance = CoreReflections.methodHandle$ServerPlayer$getAttributeMethod.invokeExact(serverPlayer, MAttributeHolders.BLOCK_BREAK_SPEED);
Object newPacket = NetworkReflections.methodHandle$ClientboundUpdateAttributesPacket0Constructor.invokeExact(entityID(), (List<?>) Lists.newArrayList(attributeInstance)); Object newPacket = NetworkReflections.methodHandle$ClientboundUpdateAttributesPacket0Constructor.invokeExact(entityId(), (List<?>) Lists.newArrayList(attributeInstance));
sendPacket(newPacket, true); sendPacket(newPacket, true);
} else { } else {
resetEffect(MMobEffects.MINING_FATIGUE); resetEffect(MMobEffects.MINING_FATIGUE);
@@ -819,11 +819,11 @@ public class BukkitServerPlayer extends Player {
CoreReflections.constructor$AttributeModifier.newInstance(KeyUtils.toResourceLocation(Key.DEFAULT_NAMESPACE, "custom_hardness"), -9999d, CoreReflections.instance$AttributeModifier$Operation$ADD_VALUE) : CoreReflections.constructor$AttributeModifier.newInstance(KeyUtils.toResourceLocation(Key.DEFAULT_NAMESPACE, "custom_hardness"), -9999d, CoreReflections.instance$AttributeModifier$Operation$ADD_VALUE) :
CoreReflections.constructor$AttributeModifier.newInstance(UUID.randomUUID(), Key.DEFAULT_NAMESPACE + ":custom_hardness", -9999d, CoreReflections.instance$AttributeModifier$Operation$ADD_VALUE); CoreReflections.constructor$AttributeModifier.newInstance(UUID.randomUUID(), Key.DEFAULT_NAMESPACE + ":custom_hardness", -9999d, CoreReflections.instance$AttributeModifier$Operation$ADD_VALUE);
Object attributeSnapshot = NetworkReflections.constructor$ClientboundUpdateAttributesPacket$AttributeSnapshot.newInstance(MAttributeHolders.BLOCK_BREAK_SPEED, 1d, Lists.newArrayList(attributeModifier)); Object attributeSnapshot = NetworkReflections.constructor$ClientboundUpdateAttributesPacket$AttributeSnapshot.newInstance(MAttributeHolders.BLOCK_BREAK_SPEED, 1d, Lists.newArrayList(attributeModifier));
Object newPacket = NetworkReflections.constructor$ClientboundUpdateAttributesPacket1.newInstance(entityID(), Lists.newArrayList(attributeSnapshot)); Object newPacket = NetworkReflections.constructor$ClientboundUpdateAttributesPacket1.newInstance(entityId(), Lists.newArrayList(attributeSnapshot));
sendPacket(newPacket, true); sendPacket(newPacket, true);
} else { } else {
Object fatiguePacket = MobEffectUtils.createPacket(MMobEffects.MINING_FATIGUE, entityID(), (byte) 9, -1, false, false, false); Object fatiguePacket = MobEffectUtils.createPacket(MMobEffects.MINING_FATIGUE, entityId(), (byte) 9, -1, false, false, false);
Object hastePacket = MobEffectUtils.createPacket(MMobEffects.HASTE, entityID(), (byte) 0, -1, false, false, false); Object hastePacket = MobEffectUtils.createPacket(MMobEffects.HASTE, entityId(), (byte) 0, -1, false, false, false);
sendPackets(List.of(fatiguePacket, hastePacket), true); sendPackets(List.of(fatiguePacket, hastePacket), true);
} }
} }
@@ -863,9 +863,9 @@ public class BukkitServerPlayer extends Player {
Object effectInstance = CoreReflections.method$ServerPlayer$getEffect.invoke(serverPlayer(), mobEffect); Object effectInstance = CoreReflections.method$ServerPlayer$getEffect.invoke(serverPlayer(), mobEffect);
Object packet; Object packet;
if (effectInstance != null) { if (effectInstance != null) {
packet = NetworkReflections.constructor$ClientboundUpdateMobEffectPacket.newInstance(entityID(), effectInstance); packet = NetworkReflections.constructor$ClientboundUpdateMobEffectPacket.newInstance(entityId(), effectInstance);
} else { } else {
packet = NetworkReflections.constructor$ClientboundRemoveMobEffectPacket.newInstance(entityID(), mobEffect); packet = NetworkReflections.constructor$ClientboundRemoveMobEffectPacket.newInstance(entityId(), mobEffect);
} }
sendPacket(packet, true); sendPacket(packet, true);
} }
@@ -975,7 +975,7 @@ public class BukkitServerPlayer extends Player {
} }
private void broadcastDestroyProgress(org.bukkit.entity.Player player, BlockPos hitPos, Object blockPos, int stage) { private void broadcastDestroyProgress(org.bukkit.entity.Player player, BlockPos hitPos, Object blockPos, int stage) {
Object packet = FastNMS.INSTANCE.constructor$ClientboundBlockDestructionPacket(Integer.MAX_VALUE - entityID(), blockPos, stage); Object packet = FastNMS.INSTANCE.constructor$ClientboundBlockDestructionPacket(Integer.MAX_VALUE - entityId(), blockPos, stage);
for (org.bukkit.entity.Player other : player.getWorld().getPlayers()) { for (org.bukkit.entity.Player other : player.getWorld().getPlayers()) {
Location otherLocation = other.getLocation(); Location otherLocation = other.getLocation();
double d0 = (double) hitPos.x() - otherLocation.getX(); double d0 = (double) hitPos.x() - otherLocation.getX();
@@ -1036,7 +1036,7 @@ public class BukkitServerPlayer extends Player {
} }
@Override @Override
public int entityID() { public int entityId() {
return platformPlayer().getEntityId(); return platformPlayer().getEntityId();
} }

8
bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/PlayerUtils.java
View File

@@ -71,20 +71,20 @@ public final class PlayerUtils {
Object previousOffHandItem = player.getItemInHand(InteractionHand.OFF_HAND).getLiteralObject(); Object previousOffHandItem = player.getItemInHand(InteractionHand.OFF_HAND).getLiteralObject();
if (isMainHandTotem) { if (isMainHandTotem) {
packets.add(NetworkReflections.constructor$ClientboundSetEquipmentPacket.newInstance( packets.add(NetworkReflections.constructor$ClientboundSetEquipmentPacket.newInstance(
player.entityID(), List.of(Pair.of(CoreReflections.instance$EquipmentSlot$MAINHAND, BukkitItemManager.instance().uniqueEmptyItem().item().getLiteralObject())) player.entityId(), List.of(Pair.of(CoreReflections.instance$EquipmentSlot$MAINHAND, BukkitItemManager.instance().uniqueEmptyItem().item().getLiteralObject()))
)); ));
} }
packets.add(NetworkReflections.constructor$ClientboundSetEquipmentPacket.newInstance( packets.add(NetworkReflections.constructor$ClientboundSetEquipmentPacket.newInstance(
player.entityID(), List.of(Pair.of(CoreReflections.instance$EquipmentSlot$OFFHAND, totemItem)) player.entityId(), List.of(Pair.of(CoreReflections.instance$EquipmentSlot$OFFHAND, totemItem))
)); ));
packets.add(NetworkReflections.constructor$ClientboundEntityEventPacket.newInstance(player.serverPlayer(), (byte) 35)); packets.add(NetworkReflections.constructor$ClientboundEntityEventPacket.newInstance(player.serverPlayer(), (byte) 35));
if (isMainHandTotem) { if (isMainHandTotem) {
packets.add(NetworkReflections.constructor$ClientboundSetEquipmentPacket.newInstance( packets.add(NetworkReflections.constructor$ClientboundSetEquipmentPacket.newInstance(
player.entityID(), List.of(Pair.of(CoreReflections.instance$EquipmentSlot$MAINHAND, previousMainHandItem.getLiteralObject())) player.entityId(), List.of(Pair.of(CoreReflections.instance$EquipmentSlot$MAINHAND, previousMainHandItem.getLiteralObject()))
)); ));
} }
packets.add(NetworkReflections.constructor$ClientboundSetEquipmentPacket.newInstance( packets.add(NetworkReflections.constructor$ClientboundSetEquipmentPacket.newInstance(
player.entityID(), List.of(Pair.of(CoreReflections.instance$EquipmentSlot$OFFHAND, previousOffHandItem)) player.entityId(), List.of(Pair.of(CoreReflections.instance$EquipmentSlot$OFFHAND, previousOffHandItem))
)); ));
if (sound != null || silent) { if (sound != null || silent) {
packets.add(NetworkReflections.constructor$ClientboundStopSoundPacket.newInstance( packets.add(NetworkReflections.constructor$ClientboundStopSoundPacket.newInstance(

2
core/src/main/java/net/momirealms/craftengine/core/entity/Entity.java
View File

@@ -27,7 +27,7 @@ public interface Entity {
float yRot(); float yRot();
int entityID(); int entityId();
World world(); World world();

2
core/src/main/java/net/momirealms/craftengine/core/entity/furniture/Furniture.java
View File

@@ -274,7 +274,7 @@ public abstract class Furniture implements Cullable {
} }
public int entityId() { public int entityId() {
return this.metaDataEntity.entityID(); return this.metaDataEntity.entityId();
} }
public boolean hasExternalModel() { public boolean hasExternalModel() {

7
core/src/main/java/net/momirealms/craftengine/core/plugin/config/Config.java
View File

@@ -215,6 +215,9 @@ public class Config {
protected int client_optimization$entity_culling$rate_limiting$bucket_size; protected int client_optimization$entity_culling$rate_limiting$bucket_size;
protected int client_optimization$entity_culling$rate_limiting$restore_per_tick; protected int client_optimization$entity_culling$rate_limiting$restore_per_tick;
protected boolean bedrock_edition_support$enable;
protected String bedrock_edition_support$player_prefix;
public Config(CraftEngine plugin) { public Config(CraftEngine plugin) {
this.plugin = plugin; this.plugin = plugin;
this.configVersion = PluginProperties.getValue("config"); this.configVersion = PluginProperties.getValue("config");
@@ -589,6 +592,10 @@ public class Config {
client_optimization$entity_culling$rate_limiting$bucket_size = config.getInt("client-optimization.entity-culling.rate-limiting.bucket-size", 300); client_optimization$entity_culling$rate_limiting$bucket_size = config.getInt("client-optimization.entity-culling.rate-limiting.bucket-size", 300);
client_optimization$entity_culling$rate_limiting$restore_per_tick = config.getInt("client-optimization.entity-culling.rate-limiting.restore-per-tick", 5); client_optimization$entity_culling$rate_limiting$restore_per_tick = config.getInt("client-optimization.entity-culling.rate-limiting.restore-per-tick", 5);
// bedrock support
bedrock_edition_support$enable = config.getBoolean("bedrock-edition-support.enable", true);
bedrock_edition_support$player_prefix = config.getString("bedrock-edition-support.player-prefix", "!");
firstTime = false; firstTime = false;
} }

2
core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/ArgumentString.java
View File

@@ -152,7 +152,7 @@ public interface ArgumentString {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof Complex that)) return false; if (!(o instanceof Complex2 that)) return false;
return this.rawText.equals(that.rawText); return this.rawText.equals(that.rawText);
} }