aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0833-Add-EntityPortalReadyEvent.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2023-09-24 12:35:16 +1000
committerNassim Jahnke <[email protected]>2023-09-24 12:35:16 +1000
commit2ec643a53ceae5960a1b128aad9f177f6ae81ed7 (patch)
tree2a62189af40a2f5ad36e5f0d3641bff81578a94b /patches/server/0833-Add-EntityPortalReadyEvent.patch
parent6be43952eb6088a3f0c9a04ede96707e720203e3 (diff)
downloadPaper-2ec643a53ceae5960a1b128aad9f177f6ae81ed7.tar.gz
Paper-2ec643a53ceae5960a1b128aad9f177f6ae81ed7.zip
Readd anti xray and oversized block entity patches
Diffstat (limited to 'patches/server/0833-Add-EntityPortalReadyEvent.patch')
-rw-r--r--patches/server/0833-Add-EntityPortalReadyEvent.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/patches/server/0833-Add-EntityPortalReadyEvent.patch b/patches/server/0833-Add-EntityPortalReadyEvent.patch
deleted file mode 100644
index fe77c37130..0000000000
--- a/patches/server/0833-Add-EntityPortalReadyEvent.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Wed, 12 May 2021 04:30:42 -0700
-Subject: [PATCH] Add EntityPortalReadyEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 781b9c6d2f05535f67322ae6bdd1423c506ab7cd..073bd0e905b258be835b5063ddd5d8d6bb17d106 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3062,6 +3062,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
- this.level().getProfiler().push("portal");
- this.portalTime = i;
-+ // Paper start
-+ io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
-+ if (!event.callEvent()) {
-+ this.portalTime = 0;
-+ } else {
-+ worldserver1 = event.getTargetWorld() == null ? null : ((CraftWorld) event.getTargetWorld()).getHandle();
-+ // Paper end
- this.setPortalCooldown();
- // CraftBukkit start
- if (this instanceof ServerPlayer) {
-@@ -3069,6 +3076,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- } else {
- this.changeDimension(worldserver1);
- }
-+ } // Paper
- // CraftBukkit end
- this.level().getProfiler().pop();
- }