geforkt von Mirrors/Paper
Fix addPassenger for Marker (#7762)
Dieser Commit ist enthalten in:
Ursprung
33c990bd9f
Commit
d119830727
@ -8,6 +8,8 @@ Subject: [PATCH] CB fixes
|
|||||||
|
|
||||||
* Removed incorrect parent perm for `minecraft.debugstick.always`
|
* Removed incorrect parent perm for `minecraft.debugstick.always`
|
||||||
|
|
||||||
|
* Fixed method signature of Marker#addPassenger
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||||
@ -21,6 +23,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
this.structureFeatureManager = new StructureFeatureManager(this, this.serverLevelData.worldGenSettings(), this.structureCheck); // CraftBukkit
|
this.structureFeatureManager = new StructureFeatureManager(this, this.serverLevelData.worldGenSettings(), this.structureCheck); // CraftBukkit
|
||||||
if (this.dimensionType().createDragonFight()) {
|
if (this.dimensionType().createDragonFight()) {
|
||||||
this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenSettings().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit
|
this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenSettings().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit
|
||||||
|
diff --git a/src/main/java/net/minecraft/world/entity/Marker.java b/src/main/java/net/minecraft/world/entity/Marker.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/entity/Marker.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/entity/Marker.java
|
||||||
|
@@ -0,0 +0,0 @@ public class Marker extends Entity {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- protected void addPassenger(Entity passenger) {
|
||||||
|
+ protected boolean addPassenger(Entity passenger) { // Paper - fix upstream
|
||||||
|
passenger.stopRiding();
|
||||||
|
+ return false; // Paper - fix upstream
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
|
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren