SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.20

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-06-08 01:30:00 +10:00
parent bac55e67d6
commit 9d740b84b0
269 changed files with 2605 additions and 2568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/net/minecraft/world/entity/npc/EntityVillager.java
@@ -90,6 +90,14 @@
@@ -91,6 +91,14 @@
import net.minecraft.world.phys.AxisAlignedBB;
import org.slf4j.Logger;
@@ -15,7 +15,7 @@
public class EntityVillager extends EntityVillagerAbstract implements ReputationHandler, VillagerDataHolder {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -148,7 +156,7 @@
@@ -149,7 +157,7 @@
@Override
public BehaviorController<EntityVillager> getBrain() {
@@ -24,7 +24,7 @@
}
@Override
@@ -231,7 +239,7 @@
@@ -232,7 +240,7 @@
this.increaseProfessionLevelOnUpdate = false;
}
@@ -33,7 +33,7 @@
}
}
@@ -359,7 +367,13 @@
@@ -360,7 +368,13 @@
while (iterator.hasNext()) {
MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
@@ -48,7 +48,7 @@
}
this.resendOffersToTradingPlayer();
@@ -428,7 +442,13 @@
@@ -429,7 +443,13 @@
while (iterator.hasNext()) {
MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
@@ -63,7 +63,7 @@
}
}
@@ -488,7 +508,7 @@
@@ -489,7 +509,7 @@
@Override
public void addAdditionalSaveData(NBTTagCompound nbttagcompound) {
super.addAdditionalSaveData(nbttagcompound);
@@ -72,7 +72,7 @@
Logger logger = EntityVillager.LOGGER;
Objects.requireNonNull(logger);
@@ -832,7 +852,12 @@
@@ -833,7 +853,12 @@
}
entitywitch.setPersistenceRequired();
@@ -86,7 +86,7 @@
this.releaseAllPois();
this.discard();
} else {
@@ -921,7 +946,7 @@
@@ -924,7 +949,7 @@
}).limit(5L).collect(Collectors.toList());
if (list1.size() >= j) {
@@ -95,21 +95,21 @@
list.forEach(SensorGolemLastSeen::golemDetected);
}
}
@@ -978,7 +1003,7 @@
@@ -981,7 +1006,7 @@
@Override
public void startSleeping(BlockPosition blockposition) {
super.startSleeping(blockposition);
- this.brain.setMemory(MemoryModuleType.LAST_SLEPT, (Object) this.level.getGameTime());
+ this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error
- this.brain.setMemory(MemoryModuleType.LAST_SLEPT, (Object) this.level().getGameTime());
+ this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level().getGameTime()); // CraftBukkit - decompile error
this.brain.eraseMemory(MemoryModuleType.WALK_TARGET);
this.brain.eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
}
@@ -986,7 +1011,7 @@
@@ -989,7 +1014,7 @@
@Override
public void stopSleeping() {
super.stopSleeping();
- this.brain.setMemory(MemoryModuleType.LAST_WOKEN, (Object) this.level.getGameTime());
+ this.brain.setMemory(MemoryModuleType.LAST_WOKEN, this.level.getGameTime()); // CraftBukkit - decompile error
- this.brain.setMemory(MemoryModuleType.LAST_WOKEN, (Object) this.level().getGameTime());
+ this.brain.setMemory(MemoryModuleType.LAST_WOKEN, this.level().getGameTime()); // CraftBukkit - decompile error
}
private boolean golemSpawnConditionsMet(long i) {

8
paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/npc/EntityVillagerTrader.java
+++ b/net/minecraft/world/entity/npc/EntityVillagerTrader.java
@@ -46,6 +46,13 @@
@@ -44,6 +44,13 @@
import net.minecraft.world.level.World;
import net.minecraft.world.phys.Vec3D;
import org.apache.commons.lang3.ArrayUtils;
+// CraftBukkit start
+import org.bukkit.Bukkit;
@@ -14,7 +14,7 @@
public class EntityVillagerTrader extends EntityVillagerAbstract {
private static final int NUMBER_OF_TRADE_OFFERS = 5;
@@ -55,6 +62,7 @@
@@ -53,6 +60,7 @@
public EntityVillagerTrader(EntityTypes<? extends EntityVillagerTrader> entitytypes, World world) {
super(entitytypes, world);
@@ -22,7 +22,7 @@
}
@Override
@@ -140,7 +148,16 @@
@@ -130,7 +138,16 @@
MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.getOffer(this, this.random);
if (merchantrecipe != null) {