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

Update to Minecraft 1.21

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-06-14 01:05:00 +10:00
parent 7c6204e1a9
commit eed041d629
255 changed files with 3585 additions and 3261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@
}
}
@@ -361,7 +370,13 @@
@@ -363,7 +372,13 @@
while (iterator.hasNext()) {
MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
@@ -49,7 +49,7 @@
}
this.resendOffersToTradingPlayer();
@@ -430,7 +445,13 @@
@@ -432,7 +447,13 @@
while (iterator.hasNext()) {
MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
@@ -64,7 +64,7 @@
}
}
@@ -490,7 +511,7 @@
@@ -492,7 +513,7 @@
@Override
public void addAdditionalSaveData(NBTTagCompound nbttagcompound) {
super.addAdditionalSaveData(nbttagcompound);
@@ -73,7 +73,7 @@
Logger logger = EntityVillager.LOGGER;
Objects.requireNonNull(logger);
@@ -513,7 +534,7 @@
@@ -515,7 +536,7 @@
public void readAdditionalSaveData(NBTTagCompound nbttagcompound) {
super.readAdditionalSaveData(nbttagcompound);
if (nbttagcompound.contains("VillagerData", 10)) {
@@ -82,7 +82,7 @@
Logger logger = EntityVillager.LOGGER;
Objects.requireNonNull(logger);
@@ -826,9 +847,14 @@
@@ -828,9 +849,14 @@
}
entitywitch.setPersistenceRequired();
@@ -99,7 +99,7 @@
} else {
super.thunderHit(worldserver, entitylightning);
}
@@ -925,7 +951,7 @@
@@ -927,7 +953,7 @@
}).limit(5L).collect(Collectors.toList());
if (list1.size() >= j) {
@@ -108,7 +108,7 @@
list.forEach(SensorGolemLastSeen::golemDetected);
}
}
@@ -982,7 +1008,7 @@
@@ -984,7 +1010,7 @@
@Override
public void startSleeping(BlockPosition blockposition) {
super.startSleeping(blockposition);
@@ -117,7 +117,7 @@
this.brain.eraseMemory(MemoryModuleType.WALK_TARGET);
this.brain.eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
}
@@ -990,7 +1016,7 @@
@@ -992,7 +1018,7 @@
@Override
public void stopSleeping() {
super.stopSleeping();

4
paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerAbstract.patch
View File

@@ -34,7 +34,7 @@
public EntityVillagerAbstract(EntityTypes<? extends EntityVillagerAbstract> entitytypes, World world) {
super(entitytypes, world);
@@ -173,7 +189,7 @@
@@ -179,7 +195,7 @@
public void readAdditionalSaveData(NBTTagCompound nbttagcompound) {
super.readAdditionalSaveData(nbttagcompound);
if (nbttagcompound.contains("Offers")) {
@@ -43,7 +43,7 @@
Logger logger = EntityVillagerAbstract.LOGGER;
Objects.requireNonNull(logger);
@@ -240,7 +256,16 @@
@@ -246,7 +262,16 @@
MerchantRecipe merchantrecipe = ((VillagerTrades.IMerchantRecipeOption) arraylist.remove(this.random.nextInt(arraylist.size()))).getOffer(this, this.random);
if (merchantrecipe != null) {