Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +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@bd097b4 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@8bae82d Use deserialised row keys in config tables (#7962)
PaperMC/Paper@3d37b42 Couple config fixes (#7975)
This commit is contained in:
BillyGalbreath
2022-06-13 22:07:53 -05:00
parent beb56e6e6c
commit 8e6f46b237
3 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT
paperCommit = e4f5e1c9ab867701eb4b3347280ad2dc099b7db0
paperCommit = 3d37b42a89db7af2dd367861fa66c28b9e4aae97
org.gradle.caching = true
org.gradle.parallel = true

23
patches/server/0006-Fix-decompile-errors.patch
View File

@@ -40,29 +40,6 @@ index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..9e17e21a48892686e94a1c21b636695a
}
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
index 45152840f10c2e0731ac653595dc0e81557227c4..7d093e4cc3357abd205302a98cc7b06cf55229bc 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
@@ -67,7 +67,7 @@ public class Tadpole extends AbstractFish {
@Override
public Brain<Tadpole> getBrain() {
- return super.getBrain();
+ return (Brain<Tadpole>) super.getBrain(); // Purpur - decompile error
}
@Override
@@ -215,8 +215,7 @@ public class Tadpole extends AbstractFish {
}
private void ageUp() {
- Level frog = this.level;
- if (frog instanceof ServerLevel serverLevel) {
+ if (this.level instanceof ServerLevel serverLevel) { // Purpur - decompile error
Frog frog = EntityType.FROG.create(this.level);
frog.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
frog.finalizeSpawn(serverLevel, this.level.getCurrentDifficultyAt(frog.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData)null, (CompoundTag)null);
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
index 056e4c2f7f632dadc0015710c032a0b718d46ff9..1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java

6
patches/server/0008-Ridables.patch
View File

@@ -2397,10 +2397,10 @@ index 9e17e21a48892686e94a1c21b636695ab84eb7cd..c88222d120c71649b2e43a20f1195901
super(entity);
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
index 7d093e4cc3357abd205302a98cc7b06cf55229bc..77f19a0f90b62b1423381d87194d0e1ae545cbbe 100644
index 3dd4e6d622a6daafa00ae971edd88a147e34beef..4dca3788a8fa335dc5969bd61cd0658f21e3bff3 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
@@ -43,13 +43,50 @@ public class Tadpole extends AbstractFish {
@@ -44,13 +44,50 @@ public class Tadpole extends AbstractFish {
public int age;
protected static final ImmutableList<SensorType<? extends Sensor<? super Tadpole>>> SENSOR_TYPES = ImmutableList.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_PLAYERS, SensorType.HURT_BY, SensorType.FROG_TEMPTATIONS);
protected static final ImmutableList<MemoryModuleType<?>> MEMORY_TYPES = ImmutableList.of(MemoryModuleType.LOOK_TARGET, MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.PATH, MemoryModuleType.NEAREST_VISIBLE_ADULT, MemoryModuleType.TEMPTATION_COOLDOWN_TICKS, MemoryModuleType.IS_TEMPTED, MemoryModuleType.TEMPTING_PLAYER, MemoryModuleType.BREED_TARGET, MemoryModuleType.IS_PANICKING);
@@ -5204,7 +5204,7 @@ index 1d8ec0f85ec42f2dcd9405df83b526ae1c59de6f..d437630610b3561029a88a075ab3ed0a
event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index e8bcb30f5236b4327883855275eb05d9f4f436e5..a288e2ec4f087571873568ead9b968b1525d106c 100644
index e784bc02ee6bf9848396a1e3a3af58b0b959b0d3..52747a0ca0578dd302a8297bed04a568a9e1fc13 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -167,4 +167,9 @@ public class PurpurConfig {