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

Update to Minecraft 1.17

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
paper-server/nms-patches/net/minecraft/world/entity/raid/EntityRaider.patch
View File

@@ -3,36 +3,36 @@
@@ -167,7 +167,7 @@
MobEffect mobeffect1 = new MobEffect(MobEffects.BAD_OMEN, 120000, i, false, false, true);
if (!this.world.getGameRules().getBoolean(GameRules.DISABLE_RAIDS)) {
if (!this.level.getGameRules().getBoolean(GameRules.RULE_DISABLE_RAIDS)) {
- entityhuman.addEffect(mobeffect1);
+ entityhuman.addEffect(mobeffect1, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN); // CraftBukkit
}
}
}
@@ -434,7 +434,7 @@
@@ -307,7 +307,7 @@
private final T mob;
- public b(EntityRaider entityraider) {
+ public b(T entityraider) { // CraftBukkit - decompile error
this.mob = entityraider;
this.a(EnumSet.of(PathfinderGoal.Type.MOVE));
}
@@ -523,7 +523,7 @@
while (iterator.hasNext()) {
EntityRaider entityraider = (EntityRaider) iterator.next();
- entityraider.setGoalTarget(this.c.getGoalTarget());
+ entityraider.setGoalTarget(this.c.getGoalTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
- entityraider.setGoalTarget(this.mob.getGoalTarget());
+ entityraider.setGoalTarget(this.mob.getGoalTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
}
}
@@ -451,7 +451,7 @@
@@ -540,7 +540,7 @@
while (iterator.hasNext()) {
EntityRaider entityraider = (EntityRaider) iterator.next();
- entityraider.setGoalTarget(entityliving);
+ entityraider.setGoalTarget(this.c.getGoalTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
+ entityraider.setGoalTarget(this.mob.getGoalTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
entityraider.setAggressive(true);
}
@@ -525,7 +525,7 @@
private final T b;
- public b(EntityRaider entityraider) {
+ public b(T entityraider) { // CraftBukkit - decompile error
this.b = entityraider;
this.a(EnumSet.of(PathfinderGoal.Type.MOVE));
}