Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-18 12:30:06 +01:00
Code Issues Projekte Releases Wiki Aktivität

SPIGOT-5133: Throwing items into secondary end world portal causes crash

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2019-07-02 10:47:00 +10:00
Ursprung a0e47473ce
Commit bf32933484
1 geänderte Dateien mit 20 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

23
nms-patches/Entity.patch
Datei anzeigen

@ -598,7 +598,7 @@
}
public void j(boolean flag) {
@@ -2037,20 +2378,33 @@
@@ -2037,33 +2378,46 @@
@Nullable
public Entity a(DimensionManager dimensionmanager) {
@ -631,10 +631,27 @@
- BlockPosition blockposition;
+ BlockPosition blockposition = location; // CraftBukkit
- if (dimensionmanager1 == DimensionManager.THE_END && dimensionmanager == DimensionManager.OVERWORLD) {
+ if (blockposition == null) { // CraftBukkit
if (dimensionmanager1 == DimensionManager.THE_END && dimensionmanager == DimensionManager.OVERWORLD) {
+ if (dimensionmanager1.getType() == DimensionManager.THE_END && dimensionmanager == DimensionManager.OVERWORLD) { // CraftBukkit
blockposition = worldserver1.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver1.getSpawn());
} else if (dimensionmanager == DimensionManager.THE_END) {
- } else if (dimensionmanager == DimensionManager.THE_END) {
+ } else if (dimensionmanager.getType() == DimensionManager.THE_END) { // CraftBukkit
blockposition = worldserver1.getDimensionSpawn();
} else {
double d0 = this.locX;
double d1 = this.locZ;
double d2 = 8.0D;
- if (dimensionmanager1 == DimensionManager.OVERWORLD && dimensionmanager == DimensionManager.NETHER) {
+ if (dimensionmanager1.getType() == DimensionManager.OVERWORLD && dimensionmanager.getType() == DimensionManager.NETHER) { // CraftBukkit
d0 /= 8.0D;
d1 /= 8.0D;
- } else if (dimensionmanager1 == DimensionManager.NETHER && dimensionmanager == DimensionManager.OVERWORLD) {
+ } else if (dimensionmanager1.getType() == DimensionManager.NETHER && dimensionmanager.getType() == DimensionManager.OVERWORLD) { // CraftBukkit
d0 *= 8.0D;
d1 *= 8.0D;
}
@@ -2088,6 +2442,25 @@
vec3d = shapedetector_shape.velocity;
f = (float) shapedetector_shape.yaw;