Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 19:07:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0232-Dolphins-naturally-aggressive-to-players-chance.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Dolphins naturally aggressive to players chance
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 2dba75b221022b1f6d0d68813c992bc796d499c5..8a5230611e4a9835f1b8b21cf09a7054da76feb9 100644
index 3873fe82ec05f84efadd28ee9f48831b95405de2..7e424c7674e6e8f1db42bbdfbb230174f885a07d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -75,6 +75,7 @@ public class Dolphin extends WaterAnimal {
@@ -81,6 +81,7 @@ public class Dolphin extends WaterAnimal {
return !entityitem.hasPickUpDelay() && entityitem.isAlive() && entityitem.isInWater();
};
private int spitCooldown; // Purpur
@@ -16,7 +16,7 @@ index 2dba75b221022b1f6d0d68813c992bc796d499c5..8a5230611e4a9835f1b8b21cf09a7054
public Dolphin(EntityType<? extends Dolphin> type, Level world) {
super(type, world);
@@ -170,6 +171,7 @@ public class Dolphin extends WaterAnimal {
@@ -176,6 +177,7 @@ public class Dolphin extends WaterAnimal {
public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
this.setAirSupply(this.getMaxAirSupply());
this.setXRot(0.0F);
@@ -24,7 +24,7 @@ index 2dba75b221022b1f6d0d68813c992bc796d499c5..8a5230611e4a9835f1b8b21cf09a7054
return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
}
@@ -240,18 +242,20 @@ public class Dolphin extends WaterAnimal {
@@ -246,18 +248,20 @@ public class Dolphin extends WaterAnimal {
this.goalSelector.addGoal(0, new BreathAirGoal(this));
this.goalSelector.addGoal(0, new TryFindWaterGoal(this));
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
@@ -47,7 +47,7 @@ index 2dba75b221022b1f6d0d68813c992bc796d499c5..8a5230611e4a9835f1b8b21cf09a7054
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4a6f833c483cde70307417b54e6cf85d68703fee..aa4ea8ffd71f67c3e7c66cd3ce2f7ed37fc7b1e2 100644
index a7321bd88a4721b348cff6c52d4dcf31d27065d3..002fb98018873d8377ff81997947c5daf85201b0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1196,6 +1196,7 @@ public class PurpurWorldConfig {