clean up level/getWorld usage in various patches

This commit is contained in:
BillyGalbreath
2022-03-08 13:53:45 -06:00
parent 1713e8a292
commit e9af29e2c6
6 changed files with 17 additions and 17 deletions

View File

@@ -101,11 +101,11 @@ index 5b79d821e8b55c8876eadcbe811a2c0584e7e02b..de70208403ef6c6c9c82ca4c1fd3b641
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
index 90e48fed68fab8e5e9f43bbeffd3a42a2ee51807..1c112e79a97648219022dc4586bfa5202fdcecab 100644
index b5002526f20fb8ae52783a6ba95ccd2d4f9b7840..a79b4a90274d25d427214b96649cdf8561469a83 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
@@ -80,6 +80,11 @@ public class Cow extends Animal {
this.isNaturallyAggressiveToPlayers = level.purpurConfig.cowNaturallyAggressiveToPlayersChance > 0.0D && random.nextDouble() <= level.purpurConfig.cowNaturallyAggressiveToPlayersChance;
this.isNaturallyAggressiveToPlayers = world.getLevel().purpurConfig.cowNaturallyAggressiveToPlayersChance > 0.0D && random.nextDouble() <= world.getLevel().purpurConfig.cowNaturallyAggressiveToPlayersChance;
return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
}
+
@@ -117,7 +117,7 @@ index 90e48fed68fab8e5e9f43bbeffd3a42a2ee51807..1c112e79a97648219022dc4586bfa520
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
index ce86a56da5aaf65a34352eab1da20e4340175248..55ea2944582ae12bfdf188a8cdc2285e4b60499e 100644
index f41aadb12c2d661014c488b4fc52298668c95da0..58dfa26b2935315e37d74f22dffe3e54ab83061a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -168,6 +168,11 @@ public class Dolphin extends WaterAnimal {
@@ -389,7 +389,7 @@ index 3c38345b32d106a169d1e6abcae54f282d08fe89..ddc69668c30e089df18858f697b6370d
public void setHomePos(BlockPos pos) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index 3ee87e888b048dd3272a633b40b5987276b30155..9e47e6e546af5e5d5c8fefa885742cfbd9a64cba 100644
index f01a8b45d8af0659718587cb53a9c8e95b28bd80..de79fbaa5a84d5b19a29d491d28b11cb41b626bb 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -212,6 +212,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -597,7 +597,7 @@ index 5347ba12f2a07601c9f044081e5e6ce6472c4a2a..0ac5264a16c9121c0f6233e83c426199
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index 9a0c450da922b0cdfd304795702df506113402ed..307634db13045413b47e2a18e614a15f325b8d3c 100644
index 09d41e2adef76a4d3fb68b3a3002572144c9044c..4e5dc1e30f981a6bc33344a18af56a09ac5d6230 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -165,6 +165,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -693,7 +693,7 @@ index 912c594c2a5df21663b26da81cc3d78b37055a6a..7b655fdcee79da60d48e886b3be0dd7c
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
index a8a1ae1689f03d9fb78395e3786d1bd7f5fcd569..130c83e7161a555ba34270a45be38cad5e8e4e5d 100644
index a79a7b178e0bb3aed1522d4f837bdc76ed1a3b8f..b0c9f34973e43f2e29d7d5e201a9d75f530a8089 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
@@ -86,6 +86,11 @@ public class Ghast extends FlyingMob implements Enemy {