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

14
paper-server/nms-patches/net/minecraft/world/entity/ambient/EntityBat.patch
View File

@@ -12,12 +12,12 @@
@@ -140,16 +142,24 @@
}
if (this.level.getNearestPlayer(EntityBat.BAT_RESTING_TARGETING, this) != null) {
if (this.level().getNearestPlayer(EntityBat.BAT_RESTING_TARGETING, this) != null) {
+ // CraftBukkit Start - Call BatToggleSleepEvent
+ if (CraftEventFactory.handleBatToggleSleepEvent(this, true)) {
+ this.setResting(false);
+ if (!flag) {
+ this.level.levelEvent((EntityHuman) null, 1025, blockposition, 0);
+ this.level().levelEvent((EntityHuman) null, 1025, blockposition, 0);
+ }
+ }
+ // CraftBukkit End
@@ -27,22 +27,22 @@
+ if (CraftEventFactory.handleBatToggleSleepEvent(this, true)) {
this.setResting(false);
if (!flag) {
this.level.levelEvent((EntityHuman) null, 1025, blockposition, 0);
this.level().levelEvent((EntityHuman) null, 1025, blockposition, 0);
}
}
- } else {
- this.setResting(false);
- if (!flag) {
- this.level.levelEvent((EntityHuman) null, 1025, blockposition, 0);
- this.level().levelEvent((EntityHuman) null, 1025, blockposition, 0);
- }
+ // CraftBukkit End - Call BatToggleSleepEvent
}
} else {
if (this.targetPosition != null && (!this.level.isEmptyBlock(this.targetPosition) || this.targetPosition.getY() <= this.level.getMinBuildHeight())) {
if (this.targetPosition != null && (!this.level().isEmptyBlock(this.targetPosition) || this.targetPosition.getY() <= this.level().getMinBuildHeight())) {
@@ -173,7 +183,11 @@
this.zza = 0.5F;
this.setYRot(this.getYRot() + f1);
if (this.random.nextInt(100) == 0 && this.level.getBlockState(blockposition1).isRedstoneConductor(this.level, blockposition1)) {
if (this.random.nextInt(100) == 0 && this.level().getBlockState(blockposition1).isRedstoneConductor(this.level(), blockposition1)) {
- this.setResting(true);
+ // CraftBukkit Start - Call BatToggleSleepEvent
+ if (CraftEventFactory.handleBatToggleSleepEvent(this, false)) {
@@ -55,7 +55,7 @@
@@ -198,7 +212,11 @@
return false;
} else {
if (!this.level.isClientSide && this.isResting()) {
if (!this.level().isClientSide && this.isResting()) {
- this.setResting(false);
+ // CraftBukkit Start - Call BatToggleSleepEvent
+ if (CraftEventFactory.handleBatToggleSleepEvent(this, true)) {