mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
Fix #294
This commit is contained in:
@@ -1510,10 +1510,10 @@ index 0000000000000000000000000000000000000000..0db337866c71283464d026a4f230016b
|
|||||||
+}
|
+}
|
||||||
diff --git a/src/main/java/org/leavesmc/leaves/bot/ServerBot.java b/src/main/java/org/leavesmc/leaves/bot/ServerBot.java
|
diff --git a/src/main/java/org/leavesmc/leaves/bot/ServerBot.java b/src/main/java/org/leavesmc/leaves/bot/ServerBot.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000000000000000000000000000000000000..1314bcb0dfa311d671fcdcfeee4a8394b69834ad
|
index 0000000000000000000000000000000000000000..ad3bf452b7efe608c1ddc3cd19329fcc7ca23231
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/main/java/org/leavesmc/leaves/bot/ServerBot.java
|
+++ b/src/main/java/org/leavesmc/leaves/bot/ServerBot.java
|
||||||
@@ -0,0 +1,767 @@
|
@@ -0,0 +1,766 @@
|
||||||
+package org.leavesmc.leaves.bot;
|
+package org.leavesmc.leaves.bot;
|
||||||
+
|
+
|
||||||
+import com.google.common.collect.Lists;
|
+import com.google.common.collect.Lists;
|
||||||
@@ -1774,7 +1774,6 @@ index 0000000000000000000000000000000000000000..1314bcb0dfa311d671fcdcfeee4a8394
|
|||||||
+ // die check start
|
+ // die check start
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public void die(@NotNull DamageSource damageSource) {
|
+ public void die(@NotNull DamageSource damageSource) {
|
||||||
+ super.die(damageSource);
|
|
||||||
+ if (removeOnDeath) {
|
+ if (removeOnDeath) {
|
||||||
+ onRemove(BotRemoveEvent.RemoveReason.DEATH);
|
+ onRemove(BotRemoveEvent.RemoveReason.DEATH);
|
||||||
+ }
|
+ }
|
||||||
@@ -1935,7 +1934,7 @@ index 0000000000000000000000000000000000000000..1314bcb0dfa311d671fcdcfeee4a8394
|
|||||||
+ if (!entities.isEmpty()) {
|
+ if (!entities.isEmpty()) {
|
||||||
+ return entities.getFirst();
|
+ return entities.getFirst();
|
||||||
+ } else {
|
+ } else {
|
||||||
+ EntityHitResult result = this.getBukkitEntity().rayTraceEntity(3, false);
|
+ EntityHitResult result = this.getBukkitEntity().rayTraceEntity(maxDistance, false);
|
||||||
+ if (result != null && (predicate == null || predicate.test(result.getEntity()))) {
|
+ if (result != null && (predicate == null || predicate.test(result.getEntity()))) {
|
||||||
+ return result.getEntity();
|
+ return result.getEntity();
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
Reference in New Issue
Block a user