Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
f07313c43f
Fixes the issue of mobs constantly going North-West in pens and other areas backported from 1.8
90 Zeilen
3.0 KiB
Diff
90 Zeilen
3.0 KiB
Diff
From 03a8823864b8a5bd6e36333137fb486378e3a63d Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <Zbob750@live.com>
|
|
Date: Tue, 22 Jul 2014 21:05:53 -0500
|
|
Subject: [PATCH] mc-dev imports
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
|
|
new file mode 100644
|
|
index 0000000..9342a3f
|
|
--- /dev/null
|
|
+++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
|
|
@@ -0,0 +1,74 @@
|
|
+package net.minecraft.server;
|
|
+
|
|
+import java.util.Random;
|
|
+
|
|
+public class RandomPositionGenerator {
|
|
+
|
|
+ private static Vec3D a = Vec3D.a(0.0D, 0.0D, 0.0D);
|
|
+
|
|
+ public static Vec3D a(EntityCreature entitycreature, int i, int j) {
|
|
+ return c(entitycreature, i, j, (Vec3D) null);
|
|
+ }
|
|
+
|
|
+ public static Vec3D a(EntityCreature entitycreature, int i, int j, Vec3D vec3d) {
|
|
+ a.a = vec3d.a - entitycreature.locX;
|
|
+ a.b = vec3d.b - entitycreature.locY;
|
|
+ a.c = vec3d.c - entitycreature.locZ;
|
|
+ return c(entitycreature, i, j, a);
|
|
+ }
|
|
+
|
|
+ public static Vec3D b(EntityCreature entitycreature, int i, int j, Vec3D vec3d) {
|
|
+ a.a = entitycreature.locX - vec3d.a;
|
|
+ a.b = entitycreature.locY - vec3d.b;
|
|
+ a.c = entitycreature.locZ - vec3d.c;
|
|
+ return c(entitycreature, i, j, a);
|
|
+ }
|
|
+
|
|
+ private static Vec3D c(EntityCreature entitycreature, int i, int j, Vec3D vec3d) {
|
|
+ Random random = entitycreature.aI();
|
|
+ boolean flag = false;
|
|
+ int k = 0;
|
|
+ int l = 0;
|
|
+ int i1 = 0;
|
|
+ float f = -99999.0F;
|
|
+ boolean flag1;
|
|
+
|
|
+ if (entitycreature.bY()) {
|
|
+ double d0 = (double) (entitycreature.bV().e(MathHelper.floor(entitycreature.locX), MathHelper.floor(entitycreature.locY), MathHelper.floor(entitycreature.locZ)) + 4.0F);
|
|
+ double d1 = (double) (entitycreature.bW() + (float) i);
|
|
+
|
|
+ flag1 = d0 < d1 * d1;
|
|
+ } else {
|
|
+ flag1 = false;
|
|
+ }
|
|
+
|
|
+ for (int j1 = 0; j1 < 10; ++j1) {
|
|
+ int k1 = random.nextInt(2 * i) - i;
|
|
+ int l1 = random.nextInt(2 * j) - j;
|
|
+ int i2 = random.nextInt(2 * i) - i;
|
|
+
|
|
+ if (vec3d == null || (double) k1 * vec3d.a + (double) i2 * vec3d.c >= 0.0D) {
|
|
+ k1 += MathHelper.floor(entitycreature.locX);
|
|
+ l1 += MathHelper.floor(entitycreature.locY);
|
|
+ i2 += MathHelper.floor(entitycreature.locZ);
|
|
+ if (!flag1 || entitycreature.b(k1, l1, i2)) {
|
|
+ float f1 = entitycreature.a(k1, l1, i2);
|
|
+
|
|
+ if (f1 > f) {
|
|
+ f = f1;
|
|
+ k = k1;
|
|
+ l = l1;
|
|
+ i1 = i2;
|
|
+ flag = true;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (flag) {
|
|
+ return Vec3D.a((double) k, (double) l, (double) i1);
|
|
+ } else {
|
|
+ return null;
|
|
+ }
|
|
+ }
|
|
+}
|
|
--
|
|
1.9.1
|
|
|