Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion paper-api/src/main/java/org/bukkit/event/Event.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ public String getEventName() {
* <li>The handlers for this event may block for any length of time.
* <li>Some implementations may selectively declare a specific event use
* as asynchronous. This behavior should be clearly defined.
* <li>Asynchronous calls are not calculated in the plugin timing system.
* </ul>
*
* @return {@code false} by default, {@code true} if the event fires asynchronously
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ public final class SimplePluginManager implements PluginManager {
public final Map<Boolean, Map<Permissible, Boolean>> defSubs = new HashMap<Boolean, Map<Permissible, Boolean>>();
public PluginManager paperPluginManager;
// Paper end
private boolean useTimings = false;

public SimplePluginManager(@NotNull Server instance, @NotNull SimpleCommandMap commandMap) {
server = instance;
Expand Down Expand Up @@ -720,12 +719,7 @@ public void registerEvent(@NotNull Class<? extends Event> event, @NotNull Listen
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}

executor = new co.aikar.timings.TimedEventExecutor(executor, plugin, null, event); // Paper
if (false) { // Spigot - RL handles useTimings check now // Paper
getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
} else {
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
}
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
}

@NotNull
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@

/**
* Extends RegisteredListener to include timing information
* @deprecated This class was part of Timings v1 and has gone unused for over a decade, timings will be removed in the future.
*/
@Deprecated(forRemoval = true)
public class TimedRegisteredListener extends RegisteredListener {
private int count;
private long totalTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public Map<Class<? extends Event>, Set<RegisteredListener>> createRegisteredList
}
}

EventExecutor executor = new co.aikar.timings.TimedEventExecutor(new EventExecutor() { // Paper
EventExecutor executor = new EventExecutor() {
@Override
public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException { // Paper
try {
Expand All @@ -304,7 +304,7 @@ public void execute(@NotNull Listener listener, @NotNull Event event) throws Eve
throw new EventException(t);
}
}
}, plugin, method, eventClass); // Paper
};
eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
}
return ret;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ public void registerEvent(@NotNull Class<? extends Event> event, @NotNull Listen
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}

executor = new TimedEventExecutor(executor, plugin, null, event);
this.getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
}

Expand Down Expand Up @@ -182,7 +181,7 @@ public Map<Class<? extends Event>, Set<RegisteredListener>> createRegisteredList
}
}

EventExecutor executor = new TimedEventExecutor(EventExecutor.create(method, eventClass), plugin, method, eventClass);
EventExecutor executor = EventExecutor.create(method, eventClass);
eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
}
return ret;
Expand Down
Loading