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

More vanilla friendly methods to update trades

Browse Source
This commit is contained in:
Lulu13022002
2022-10-16 16:12:49 +02:00
parent 9db4bb7ac6
commit 533bc0c468
2 changed files with 66 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
paper-server/patches/sources/net/minecraft/world/entity/npc/Villager.java.patch
View File

@@ -24,25 +24,25 @@
}
@Override
@@ -214,7 +222,18 @@
public boolean assignProfessionWhenSpawned() {
@@ -216,7 +224,18 @@
return this.assignProfessionWhenSpawned;
+ }
+
}
+ // Spigot Start
+ @Override
@Override
+ public void inactiveTick() {
+ // SPIGOT-3874, SPIGOT-3894, SPIGOT-3846, SPIGOT-5286 :(
+ if (this.level().spigotConfig.tickInactiveVillagers && this.isEffectiveAi()) {
+ this.customServerAiStep((ServerLevel) this.level());
+ }
+ super.inactiveTick();
}
+ }
+ // Spigot End
@Override
+
+ @Override
protected void customServerAiStep(ServerLevel world) {
ProfilerFiller gameprofilerfiller = Profiler.get();
@@ -235,7 +254,7 @@
this.increaseProfessionLevelOnUpdate = false;
}
@@ -156,7 +156,33 @@
if (entitywitch == null) {
super.thunderHit(world, lightning);
@@ -906,7 +946,7 @@
@@ -855,6 +895,12 @@
@Override
protected void updateTrades() {
+ // Paper start - More vanilla friendly methods to update trades
+ updateTrades(TRADES_PER_LEVEL);
+ }
+
+ public boolean updateTrades(int amount) {
+ // Paper end - More vanilla friendly methods to update trades
VillagerData villagerdata = this.getVillagerData();
Int2ObjectMap int2objectmap;
@@ -872,9 +918,11 @@
if (avillagertrades_imerchantrecipeoption != null) {
MerchantOffers merchantrecipelist = this.getOffers();
- this.addOffersFromItemListings(merchantrecipelist, avillagertrades_imerchantrecipeoption, 2);
+ this.addOffersFromItemListings(merchantrecipelist, avillagertrades_imerchantrecipeoption, amount); // Paper - More vanilla friendly methods to update trades
+ return true; // Paper - More vanilla friendly methods to update trades
}
}
+ return false; // Paper - More vanilla friendly methods to update trades
}
public void gossip(ServerLevel world, Villager villager, long time) {
@@ -906,7 +954,7 @@
}).limit(5L).toList();
if (list1.size() >= requiredCount) {
@@ -165,7 +191,7 @@
list.forEach(GolemSensor::golemDetected);
}
}
@@ -963,7 +1003,7 @@
@@ -963,7 +1011,7 @@
@Override
public void startSleeping(BlockPos pos) {
super.startSleeping(pos);
@@ -174,7 +200,7 @@
this.brain.eraseMemory(MemoryModuleType.WALK_TARGET);
this.brain.eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
}
@@ -971,7 +1011,7 @@
@@ -971,7 +1019,7 @@
@Override
public void stopSleeping() {
super.stopSleeping();