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

readd removal cause for thrown eggs

Browse Source
This commit is contained in:
Lulu13022002
2024-12-15 23:07:15 +01:00
parent f5cd5989a4
commit ec57b99bf5
22 changed files with 96 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@
+ offer.increaseUses();
+ }
+ if (event == null || event.isRewardingExp()) {
+ this.rewardTradeXp(offer);
+ this.rewardTradeXp(offer);
+ }
+ this.notifyTrade(offer);
+ }

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

@@ -22,7 +22,7 @@
+ // Spigot Start
+ @Override
+ public void inactiveTick() {
+ // SPIGOT-3874, SPIGOT-3894, SPIGOT-3846, SPIGOT-5286 :(
+ // SPIGOT-3874, SPIGOT-3894, SPIGOT-3846, SPIGOT-5286 :(
+ if (this.level().spigotConfig.tickInactiveVillagers && this.isEffectiveAi()) {
+ this.customServerAiStep((ServerLevel) this.level());
+ }

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

@@ -14,7 +14,7 @@
- serverLevelData.setWanderingTraderSpawnChance(this.spawnChance);
- }
+ // Paper start - Add Wandering Trader spawn rate config options
+ this.tickDelay = Integer.MIN_VALUE;
+ this.tickDelay = Integer.MIN_VALUE;
+ // this.spawnDelay = serverLevelData.getWanderingTraderSpawnDelay();
+ // this.spawnChance = serverLevelData.getWanderingTraderSpawnChance();
+ // if (this.spawnDelay == 0 && this.spawnChance == 0) {
@@ -81,7 +81,7 @@
this.serverLevelData.setWanderingTraderId(wanderingTrader.getUUID());
- wanderingTrader.setDespawnDelay(48000);
+ //wanderingTrader.setDespawnDelay(48000); // CraftBukkit - moved to EntityVillagerTrader constructor. This lets the value be modified by plugins on CreatureSpawnEvent
+ // wanderingTrader.setDespawnDelay(48000); // Paper - moved above, modifiable by plugins on CreatureSpawnEvent
wanderingTrader.setWanderTarget(blockPos1);
wanderingTrader.restrictTo(blockPos1, 16);
return true;